排产计划修改

gavel/src/main/java/com/gavel/kwell/dao/impl/PcjhkDaoImpl.java

@@ -20,7 +20,7 @@ public class PcjhkDaoImpl extends BaseDaoImpl implements PcjhkDao {
 		 SqlMap sqlMap = new SqlMap();
         sqlMap.setPageNo(condition.getPageNo());
         sqlMap.setRowCount(condition.getPageSize());
-        sqlMap.append("select PCJH_ID, PCJH_DJID, PCJH_JHRQ,PCJH_JSRQ, PCJH_BMID, PCJH_JHR, ");
+        sqlMap.append("select PCJH_ID, PCJH_DJID, PCJH_JHRQ,U_PCJH_JSRQ, PCJH_BMID, PCJH_JHR, ");
         sqlMap.append("   PCJH_DJLY, PCJH_BZ, PCJH_WHRID, PCJH_WHR, PCJH_WHSJ, ");
         sqlMap.append("   PCJH_CJRID, PCJH_CJR, PCJH_CJSJ, PCJH_SYSVERSION,BM_CODE, BM_NAME  ");
         sqlMap.append("from PCJH ");

gavel/src/main/java/com/gavel/kwell/dao/impl/PcjhmxkDaoImpl.java

@@ -18,7 +18,7 @@ public class PcjhmxkDaoImpl extends BaseDaoImpl implements PcjhmxkDao {
 		 SqlMap sqlMap = new SqlMap();
         sqlMap.setPageNo(condition.getPageNo());
         sqlMap.setRowCount(condition.getPageSize());
-        sqlMap.append("select PCJHMX_ID, PCJHMX_MID, PCJHMX_XH, PCJHMX_WOID, PCJHMX_JHRQ,PCJHMX_JSRQ, ");
+        sqlMap.append("select PCJHMX_ID, PCJHMX_MID, PCJHMX_XH, PCJHMX_WOID, U_PCJHMX_JSRQ,PCJHMX_JHRQ,");
         sqlMap.append("   PCJHMX_WLID, PCJHMX_JHSL, PCJHMX_WGSL, PCJHMX_HGSL, PCJHMX_BHGSL, ");
         sqlMap.append("   PCJHMX_BZ, PCJHMX_WHRID, PCJHMX_WHR, PCJHMX_WHSJ, PCJHMX_CJRID, ");
         sqlMap.append("   PCJHMX_CJR, PCJHMX_CJSJ, PCJHMX_SYSVERSION, ");

gavel/src/main/java/com/gavel/kwell/persistent/Pcjhk.java

@@ -3,11 +3,14 @@ package com.gavel.kwell.persistent;
 import java.util.Date;
 
 import com.gavel.persistence.annotation.FieldMeta;
+import com.gavel.persistence.annotation.TableMeta;
 import com.gavel.wo.persistent.Pcjh;
 
+
+@TableMeta(id = "PCJH", name = "PCJH")
 public class Pcjhk extends Pcjh{
 	private static final long serialVersionUID = 1234567890L;
-	@FieldMeta(fieldName = "PCJH_JSRQ", caption = "计划结束日期")
+	@FieldMeta(fieldName = "U_PCJH_JSRQ", caption = "计划结束日期")
 	private Date jsrq;
 
 	public Date getJsrq() {

gavel/src/main/java/com/gavel/kwell/persistent/Pcjhmxk.java

@@ -3,12 +3,14 @@ package com.gavel.kwell.persistent;
 import java.util.Date;
 
 import com.gavel.persistence.annotation.FieldMeta;
+import com.gavel.persistence.annotation.TableMeta;
 import com.gavel.wo.persistent.Pcjhmx;
 
+@TableMeta(id = "PCJHMX", name = "PCJHMX")
 public class Pcjhmxk extends Pcjhmx{
 	
 	private static final long serialVersionUID = 1234567890L;
-	@FieldMeta(fieldName = "PCJHMX_JSRQ", caption = "计划结束日期")
+	@FieldMeta(fieldName = "U_PCJHMX_JSRQ", caption = "计划结束日期")
 	private Date jsrq;
 
 	public Date getJsrq() {

gavel/src/main/resources/jdbc.properties

 # erp测试环境
 jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-jdbc.url = jdbc:mysql://localhost:3306/kwell?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+jdbc.url = jdbc:mysql://192.168.30.254:3306/kewll2?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
 jdbc.username = root
 jdbc.password = root
 

gavel/src/main/resources/templates/views/wo/pcjhk/edit.html

@@ -30,7 +30,7 @@
                     <div class="gui-col-sm3">
                         <label class="gui-form-label">开始日期：</label>
                         <div class="gui-input-block">
-                            <input type="text" name="ksrq" data-toggle="gui-datebox" data-options="required:true,disabled:true" >
+                            <input type="text" name="jhrq" data-toggle="gui-datebox" data-options="required:true,disabled:true" >
                         </div>
                     </div>
 					<div class="gui-col-sm3">
@@ -95,7 +95,7 @@
     $(function () {
         var $div=$('#woPcjhkEdit');
         var $datagrid = $('#bzEditPcjhmxk');
-        var $datksrq = $div.find('input[name="ksrq"]');
+        var $datksrq = $div.find('input[name="jhrq"]');
 		var $datjsrq = $div.find('input[name="jsrq"]');
         var $cbxBmid = $div.find('input[name="bmid"]');
         var $datWhsj = $div.find('input[name="whsj"]');
@@ -119,7 +119,7 @@
             var columns = [
                 {title: "序号", field: "xh", fieldType: "ftString",width:70},
                 {title: "生产单号", field: "woDjid", fieldType: "ftString",width:120},
-                {title: "开始日期", field: "ksrq", fieldType: "date"
+                {title: "开始日期", field: "jhrq", fieldType: "date"
                 },
 				{title: "结束日期", field: "jsrq", fieldType: "date"
 				// , editor: {
@@ -184,7 +184,7 @@
                             item['woid']=item['id'];
                             item['woDjid']=item['djid'];
                             item['jhsl']=item['xqsl'];
-							item['ksrq']=woksrq
+							item['jhrq']=woksrq
 							item['jsrq']=wojsrq
                             item['xh']=xh+1;
                             delete item["id"];