Rz_Ware_Grop
/
Proj_RZWare_Java_service
Прати 9
Волим 0
Креирај огранак 0
Код Дискусије 0 Захтеви за спајање 0 Издања 0 Вики Activity
Преглед изворни кода

编辑材料信息

dxq пре 2 месеци
родитељ
9333e2c3a5
комит
3b78b98691
9 измењених фајлова са 217 додато и 231 уклоњено
Један поглед Покажи статистику Diff
  1. 30
    30
      sto/src/main/java/com/shinsoft/sto/mapper/ware/ChangeRecordMapper.xml
  2. 30
    30
      sto/src/main/java/com/shinsoft/sto/mapper/ware/HProdMasterMapper.xml
  3. 30
    30
      sto/src/main/java/com/shinsoft/sto/mapper/ware/ProdMasterMapper.xml
  4. 6
    6
      sto/src/main/java/com/shinsoft/sto/mapper/ware/WareStoreMapper.xml
  5. 30
    30
      sto/src/main/java/com/shinsoft/sto/model/ware/ChangeRecord.java
  6. 30
    30
      sto/src/main/java/com/shinsoft/sto/model/ware/HProdMaster.java
  7. 30
    30
      sto/src/main/java/com/shinsoft/sto/model/ware/ProdMaster.java
  8. 6
    6
      sto/src/main/java/com/shinsoft/sto/model/ware/WareStoreQueryVO.java
  9. 25
    39
      sto/src/main/java/com/shinsoft/sto/service/impl/ware/ProdMasterServiceImpl.java

+ 30
- 30
sto/src/main/java/com/shinsoft/sto/mapper/ware/ChangeRecordMapper.xml Прегледај датотеку

22 
     <result column="weight" property="weight" jdbcType="DECIMAL" />
 22 
     <result column="weight" property="weight" jdbcType="DECIMAL" />
23 
     <result column="quantity" property="quantity" jdbcType="DECIMAL" />
 23 
     <result column="quantity" property="quantity" jdbcType="DECIMAL" />
24 
     <result column="delivery_address" property="deliveryAddress" jdbcType="VARCHAR" />
 24 
     <result column="delivery_address" property="deliveryAddress" jdbcType="VARCHAR" />
25 
-    <result column="attrib_01" property="attrib01" jdbcType="VARCHAR" />
26 
-    <result column="attrib_02" property="attrib02" jdbcType="VARCHAR" />
27 
-    <result column="attrib_03" property="attrib03" jdbcType="VARCHAR" />
28 
-    <result column="attrib_04" property="attrib04" jdbcType="VARCHAR" />
29 
-    <result column="attrib_05" property="attrib05" jdbcType="VARCHAR" />
30 
-    <result column="attrib_06" property="attrib06" jdbcType="VARCHAR" />
31 
-    <result column="attrib_07" property="attrib07" jdbcType="VARCHAR" />
32 
-    <result column="attrib_08" property="attrib08" jdbcType="VARCHAR" />
33 
-    <result column="attrib_09" property="attrib09" jdbcType="VARCHAR" />
34 
-    <result column="attrib_10" property="attrib10" jdbcType="VARCHAR" />
35 
-    <result column="attrib_11" property="attrib11" jdbcType="VARCHAR" />
36 
-    <result column="attrib_12" property="attrib12" jdbcType="VARCHAR" />
37 
-    <result column="attrib_13" property="attrib13" jdbcType="VARCHAR" />
38 
-    <result column="attrib_14" property="attrib14" jdbcType="VARCHAR" />
39 
-    <result column="attrib_15" property="attrib15" jdbcType="VARCHAR" />
40 
-    <result column="attrib_16" property="attrib16" jdbcType="VARCHAR" />
41 
-    <result column="attrib_17" property="attrib17" jdbcType="VARCHAR" />
42 
-    <result column="attrib_18" property="attrib18" jdbcType="VARCHAR" />
43 
-    <result column="attrib_19" property="attrib19" jdbcType="VARCHAR" />
44 
-    <result column="attrib_20" property="attrib20" jdbcType="VARCHAR" />
45 
-    <result column="attrib_21" property="attrib21" jdbcType="VARCHAR" />
46 
-    <result column="attrib_22" property="attrib22" jdbcType="VARCHAR" />
47 
-    <result column="attrib_23" property="attrib23" jdbcType="VARCHAR" />
48 
-    <result column="attrib_24" property="attrib24" jdbcType="VARCHAR" />
49 
-    <result column="attrib_25" property="attrib25" jdbcType="VARCHAR" />
50 
-    <result column="remark_1" property="remark1" jdbcType="VARCHAR" />
51 
-    <result column="remark_2" property="remark2" jdbcType="VARCHAR" />
52 
-    <result column="remark_3" property="remark3" jdbcType="VARCHAR" />
53 
-    <result column="remark_4" property="remark4" jdbcType="VARCHAR" />
54 
-    <result column="remark_5" property="remark5" jdbcType="VARCHAR" />
25 
+    <result column="attrib_01" property="attrib_01" jdbcType="VARCHAR" />
26 
+    <result column="attrib_02" property="attrib_02" jdbcType="VARCHAR" />
27 
+    <result column="attrib_03" property="attrib_03" jdbcType="VARCHAR" />
28 
+    <result column="attrib_04" property="attrib_04" jdbcType="VARCHAR" />
29 
+    <result column="attrib_05" property="attrib_05" jdbcType="VARCHAR" />
30 
+    <result column="attrib_06" property="attrib_06" jdbcType="VARCHAR" />
31 
+    <result column="attrib_07" property="attrib_07" jdbcType="VARCHAR" />
32 
+    <result column="attrib_08" property="attrib_08" jdbcType="VARCHAR" />
33 
+    <result column="attrib_09" property="attrib_09" jdbcType="VARCHAR" />
34 
+    <result column="attrib_10" property="attrib_10" jdbcType="VARCHAR" />
35 
+    <result column="attrib_11" property="attrib_11" jdbcType="VARCHAR" />
36 
+    <result column="attrib_12" property="attrib_12" jdbcType="VARCHAR" />
37 
+    <result column="attrib_13" property="attrib_13" jdbcType="VARCHAR" />
38 
+    <result column="attrib_14" property="attrib_14" jdbcType="VARCHAR" />
39 
+    <result column="attrib_15" property="attrib_15" jdbcType="VARCHAR" />
40 
+    <result column="attrib_16" property="attrib_16" jdbcType="VARCHAR" />
41 
+    <result column="attrib_17" property="attrib_17" jdbcType="VARCHAR" />
42 
+    <result column="attrib_18" property="attrib_18" jdbcType="VARCHAR" />
43 
+    <result column="attrib_19" property="attrib_19" jdbcType="VARCHAR" />
44 
+    <result column="attrib_20" property="attrib_20" jdbcType="VARCHAR" />
45 
+    <result column="attrib_21" property="attrib_21" jdbcType="VARCHAR" />
46 
+    <result column="attrib_22" property="attrib_22" jdbcType="VARCHAR" />
47 
+    <result column="attrib_23" property="attrib_23" jdbcType="VARCHAR" />
48 
+    <result column="attrib_24" property="attrib_24" jdbcType="VARCHAR" />
49 
+    <result column="attrib_25" property="attrib_25" jdbcType="VARCHAR" />
50 
+    <result column="remark_1" property="remark_1" jdbcType="VARCHAR" />
51 
+    <result column="remark_2" property="remark_2" jdbcType="VARCHAR" />
52 
+    <result column="remark_3" property="remark_3" jdbcType="VARCHAR" />
53 
+    <result column="remark_4" property="remark_4" jdbcType="VARCHAR" />
54 
+    <result column="remark_5" property="remark_5" jdbcType="VARCHAR" />
55 
     <result column="add_id" property="addId" jdbcType="VARCHAR" />
 55 
     <result column="add_id" property="addId" jdbcType="VARCHAR" />
56 
     <result column="add_time" property="addTime" jdbcType="TIMESTAMP" />
 56 
     <result column="add_time" property="addTime" jdbcType="TIMESTAMP" />
57 
     <result column="modify_id" property="modifyId" jdbcType="VARCHAR" />
 57 
     <result column="modify_id" property="modifyId" jdbcType="VARCHAR" />

+ 30
- 30
sto/src/main/java/com/shinsoft/sto/mapper/ware/HProdMasterMapper.xml Прегледај датотеку

19 
     <result column="lock_flag" property="lockFlag" jdbcType="VARCHAR" />
 19 
     <result column="lock_flag" property="lockFlag" jdbcType="VARCHAR" />
20 
     <result column="in_flag" property="inFlag" jdbcType="VARCHAR" />
 20 
     <result column="in_flag" property="inFlag" jdbcType="VARCHAR" />
21 
     <result column="out_flag" property="outFlag" jdbcType="VARCHAR" />
 21 
     <result column="out_flag" property="outFlag" jdbcType="VARCHAR" />
22 
-    <result column="attrib_01" property="attrib01" jdbcType="VARCHAR" />
23 
-    <result column="attrib_02" property="attrib02" jdbcType="VARCHAR" />
24 
-    <result column="attrib_03" property="attrib03" jdbcType="VARCHAR" />
25 
-    <result column="attrib_04" property="attrib04" jdbcType="VARCHAR" />
26 
-    <result column="attrib_05" property="attrib05" jdbcType="VARCHAR" />
27 
-    <result column="attrib_06" property="attrib06" jdbcType="VARCHAR" />
28 
-    <result column="attrib_07" property="attrib07" jdbcType="VARCHAR" />
29 
-    <result column="attrib_08" property="attrib08" jdbcType="VARCHAR" />
30 
-    <result column="attrib_09" property="attrib09" jdbcType="VARCHAR" />
31 
-    <result column="attrib_10" property="attrib10" jdbcType="VARCHAR" />
32 
-    <result column="attrib_11" property="attrib11" jdbcType="VARCHAR" />
33 
-    <result column="attrib_12" property="attrib12" jdbcType="VARCHAR" />
34 
-    <result column="attrib_13" property="attrib13" jdbcType="VARCHAR" />
35 
-    <result column="attrib_14" property="attrib14" jdbcType="VARCHAR" />
36 
-    <result column="attrib_15" property="attrib15" jdbcType="VARCHAR" />
37 
-    <result column="attrib_16" property="attrib16" jdbcType="VARCHAR" />
38 
-    <result column="attrib_17" property="attrib17" jdbcType="VARCHAR" />
39 
-    <result column="attrib_18" property="attrib18" jdbcType="VARCHAR" />
40 
-    <result column="attrib_19" property="attrib19" jdbcType="VARCHAR" />
41 
-    <result column="attrib_20" property="attrib20" jdbcType="VARCHAR" />
42 
-    <result column="attrib_21" property="attrib21" jdbcType="VARCHAR" />
43 
-    <result column="attrib_22" property="attrib22" jdbcType="VARCHAR" />
44 
-    <result column="attrib_23" property="attrib23" jdbcType="VARCHAR" />
45 
-    <result column="attrib_24" property="attrib24" jdbcType="VARCHAR" />
46 
-    <result column="attrib_25" property="attrib25" jdbcType="VARCHAR" />
47 
-    <result column="remark_1" property="remark1" jdbcType="VARCHAR" />
48 
-    <result column="remark_2" property="remark2" jdbcType="VARCHAR" />
49 
-    <result column="remark_3" property="remark3" jdbcType="VARCHAR" />
50 
-    <result column="remark_4" property="remark4" jdbcType="VARCHAR" />
51 
-    <result column="remark_5" property="remark5" jdbcType="VARCHAR" />
22 
+    <result column="attrib_01" property="attrib_01" jdbcType="VARCHAR" />
23 
+    <result column="attrib_02" property="attrib_02" jdbcType="VARCHAR" />
24 
+    <result column="attrib_03" property="attrib_03" jdbcType="VARCHAR" />
25 
+    <result column="attrib_04" property="attrib_04" jdbcType="VARCHAR" />
26 
+    <result column="attrib_05" property="attrib_05" jdbcType="VARCHAR" />
27 
+    <result column="attrib_06" property="attrib_06" jdbcType="VARCHAR" />
28 
+    <result column="attrib_07" property="attrib_07" jdbcType="VARCHAR" />
29 
+    <result column="attrib_08" property="attrib_08" jdbcType="VARCHAR" />
30 
+    <result column="attrib_09" property="attrib_09" jdbcType="VARCHAR" />
31 
+    <result column="attrib_10" property="attrib_10" jdbcType="VARCHAR" />
32 
+    <result column="attrib_11" property="attrib_11" jdbcType="VARCHAR" />
33 
+    <result column="attrib_12" property="attrib_12" jdbcType="VARCHAR" />
34 
+    <result column="attrib_13" property="attrib_13" jdbcType="VARCHAR" />
35 
+    <result column="attrib_14" property="attrib_14" jdbcType="VARCHAR" />
36 
+    <result column="attrib_15" property="attrib_15" jdbcType="VARCHAR" />
37 
+    <result column="attrib_16" property="attrib_16" jdbcType="VARCHAR" />
38 
+    <result column="attrib_17" property="attrib_17" jdbcType="VARCHAR" />
39 
+    <result column="attrib_18" property="attrib_18" jdbcType="VARCHAR" />
40 
+    <result column="attrib_19" property="attrib_19" jdbcType="VARCHAR" />
41 
+    <result column="attrib_20" property="attrib_20" jdbcType="VARCHAR" />
42 
+    <result column="attrib_21" property="attrib_21" jdbcType="VARCHAR" />
43 
+    <result column="attrib_22" property="attrib_22" jdbcType="VARCHAR" />
44 
+    <result column="attrib_23" property="attrib_23" jdbcType="VARCHAR" />
45 
+    <result column="attrib_24" property="attrib_24" jdbcType="VARCHAR" />
46 
+    <result column="attrib_25" property="attrib_25" jdbcType="VARCHAR" />
47 
+    <result column="remark_1" property="remark_1" jdbcType="VARCHAR" />
48 
+    <result column="remark_2" property="remark_2" jdbcType="VARCHAR" />
49 
+    <result column="remark_3" property="remark_3" jdbcType="VARCHAR" />
50 
+    <result column="remark_4" property="remark_4" jdbcType="VARCHAR" />
51 
+    <result column="remark_5" property="remark_5" jdbcType="VARCHAR" />
52 
     <result column="add_id" property="addId" jdbcType="VARCHAR" />
 52 
     <result column="add_id" property="addId" jdbcType="VARCHAR" />
53 
     <result column="add_time" property="addTime" jdbcType="TIMESTAMP" />
 53 
     <result column="add_time" property="addTime" jdbcType="TIMESTAMP" />
54 
     <result column="modify_id" property="modifyId" jdbcType="VARCHAR" />
 54 
     <result column="modify_id" property="modifyId" jdbcType="VARCHAR" />

+ 30
- 30
sto/src/main/java/com/shinsoft/sto/mapper/ware/ProdMasterMapper.xml Прегледај датотеку

19 
     <result column="lock_flag" property="lockFlag" jdbcType="VARCHAR" />
 19 
     <result column="lock_flag" property="lockFlag" jdbcType="VARCHAR" />
20 
     <result column="in_flag" property="inFlag" jdbcType="VARCHAR" />
 20 
     <result column="in_flag" property="inFlag" jdbcType="VARCHAR" />
21 
     <result column="out_flag" property="outFlag" jdbcType="VARCHAR" />
 21 
     <result column="out_flag" property="outFlag" jdbcType="VARCHAR" />
22 
-    <result column="attrib_01" property="attrib01" jdbcType="VARCHAR" />
23 
-    <result column="attrib_02" property="attrib02" jdbcType="VARCHAR" />
24 
-    <result column="attrib_03" property="attrib03" jdbcType="VARCHAR" />
25 
-    <result column="attrib_04" property="attrib04" jdbcType="VARCHAR" />
26 
-    <result column="attrib_05" property="attrib05" jdbcType="VARCHAR" />
27 
-    <result column="attrib_06" property="attrib06" jdbcType="VARCHAR" />
28 
-    <result column="attrib_07" property="attrib07" jdbcType="VARCHAR" />
29 
-    <result column="attrib_08" property="attrib08" jdbcType="VARCHAR" />
30 
-    <result column="attrib_09" property="attrib09" jdbcType="VARCHAR" />
31 
-    <result column="attrib_10" property="attrib10" jdbcType="VARCHAR" />
32 
-    <result column="attrib_11" property="attrib11" jdbcType="VARCHAR" />
33 
-    <result column="attrib_12" property="attrib12" jdbcType="VARCHAR" />
34 
-    <result column="attrib_13" property="attrib13" jdbcType="VARCHAR" />
35 
-    <result column="attrib_14" property="attrib14" jdbcType="VARCHAR" />
36 
-    <result column="attrib_15" property="attrib15" jdbcType="VARCHAR" />
37 
-    <result column="attrib_16" property="attrib16" jdbcType="VARCHAR" />
38 
-    <result column="attrib_17" property="attrib17" jdbcType="VARCHAR" />
39 
-    <result column="attrib_18" property="attrib18" jdbcType="VARCHAR" />
40 
-    <result column="attrib_19" property="attrib19" jdbcType="VARCHAR" />
41 
-    <result column="attrib_20" property="attrib20" jdbcType="VARCHAR" />
42 
-    <result column="attrib_21" property="attrib21" jdbcType="VARCHAR" />
43 
-    <result column="attrib_22" property="attrib22" jdbcType="VARCHAR" />
44 
-    <result column="attrib_23" property="attrib23" jdbcType="VARCHAR" />
45 
-    <result column="attrib_24" property="attrib24" jdbcType="VARCHAR" />
46 
-    <result column="attrib_25" property="attrib25" jdbcType="VARCHAR" />
47 
-    <result column="remark_1" property="remark1" jdbcType="VARCHAR" />
48 
-    <result column="remark_2" property="remark2" jdbcType="VARCHAR" />
49 
-    <result column="remark_3" property="remark3" jdbcType="VARCHAR" />
50 
-    <result column="remark_4" property="remark4" jdbcType="VARCHAR" />
51 
-    <result column="remark_5" property="remark5" jdbcType="VARCHAR" />
22 
+    <result column="attrib_01" property="attrib_01" jdbcType="VARCHAR" />
23 
+    <result column="attrib_02" property="attrib_02" jdbcType="VARCHAR" />
24 
+    <result column="attrib_03" property="attrib_03" jdbcType="VARCHAR" />
25 
+    <result column="attrib_04" property="attrib_04" jdbcType="VARCHAR" />
26 
+    <result column="attrib_05" property="attrib_05" jdbcType="VARCHAR" />
27 
+    <result column="attrib_06" property="attrib_06" jdbcType="VARCHAR" />
28 
+    <result column="attrib_07" property="attrib_07" jdbcType="VARCHAR" />
29 
+    <result column="attrib_08" property="attrib_08" jdbcType="VARCHAR" />
30 
+    <result column="attrib_09" property="attrib_09" jdbcType="VARCHAR" />
31 
+    <result column="attrib_10" property="attrib_10" jdbcType="VARCHAR" />
32 
+    <result column="attrib_11" property="attrib_11" jdbcType="VARCHAR" />
33 
+    <result column="attrib_12" property="attrib_12" jdbcType="VARCHAR" />
34 
+    <result column="attrib_13" property="attrib_13" jdbcType="VARCHAR" />
35 
+    <result column="attrib_14" property="attrib_14" jdbcType="VARCHAR" />
36 
+    <result column="attrib_15" property="attrib_15" jdbcType="VARCHAR" />
37 
+    <result column="attrib_16" property="attrib_16" jdbcType="VARCHAR" />
38 
+    <result column="attrib_17" property="attrib_17" jdbcType="VARCHAR" />
39 
+    <result column="attrib_18" property="attrib_18" jdbcType="VARCHAR" />
40 
+    <result column="attrib_19" property="attrib_19" jdbcType="VARCHAR" />
41 
+    <result column="attrib_20" property="attrib_20" jdbcType="VARCHAR" />
42 
+    <result column="attrib_21" property="attrib_21" jdbcType="VARCHAR" />
43 
+    <result column="attrib_22" property="attrib_22" jdbcType="VARCHAR" />
44 
+    <result column="attrib_23" property="attrib_23" jdbcType="VARCHAR" />
45 
+    <result column="attrib_24" property="attrib_24" jdbcType="VARCHAR" />
46 
+    <result column="attrib_25" property="attrib_25" jdbcType="VARCHAR" />
47 
+    <result column="remark_1" property="remark_1" jdbcType="VARCHAR" />
48 
+    <result column="remark_2" property="remark_2" jdbcType="VARCHAR" />
49 
+    <result column="remark_3" property="remark_3" jdbcType="VARCHAR" />
50 
+    <result column="remark_4" property="remark_4" jdbcType="VARCHAR" />
51 
+    <result column="remark_5" property="remark_5" jdbcType="VARCHAR" />
52 
     <result column="add_id" property="addId" jdbcType="VARCHAR" />
 52 
     <result column="add_id" property="addId" jdbcType="VARCHAR" />
53 
     <result column="add_time" property="addTime" jdbcType="TIMESTAMP" />
 53 
     <result column="add_time" property="addTime" jdbcType="TIMESTAMP" />
54 
     <result column="modify_id" property="modifyId" jdbcType="VARCHAR" />
 54 
     <result column="modify_id" property="modifyId" jdbcType="VARCHAR" />

+ 6
- 6
sto/src/main/java/com/shinsoft/sto/mapper/ware/WareStoreMapper.xml Прегледај датотеку

83 
             w2.CUSTOMER_NM customer_company,
 83 
             w2.CUSTOMER_NM customer_company,
84 
             pm.prod_no,
 84 
             pm.prod_no,
85 
             pm.in_truck_no,
 85 
             pm.in_truck_no,
86 
-            pm.ATTRIB_01 ,
87 
-            pm.ATTRIB_02 ,
88 
-            pm.ATTRIB_03 ,
89 
-            pm.ATTRIB_04 ,
90 
-            pm.ATTRIB_05 ,
91 
-            pm.remark_1 ,
86 
+            pm.attrib_01 attrib_01,
87 
+            pm.attrib_02 attrib_02,
88 
+            pm.attrib_03,
89 
+            pm.attrib_04,
90 
+            pm.attrib_05,
91 
+            pm.remark_1,
92 
             pm.weight,
 92 
             pm.weight,
93 
             pm.quantity,
 93 
             pm.quantity,
94 
             pm.out_flag,
 94 
             pm.out_flag,

+ 30
- 30
sto/src/main/java/com/shinsoft/sto/model/ware/ChangeRecord.java Прегледај датотеку

72 
     private String deliveryAddress;
 72 
     private String deliveryAddress;
73
73
74 
     @ApiModelProperty("材料属性01")
 74 
     @ApiModelProperty("材料属性01")
75 
-    private String attrib01;
75 
+    private String attrib_01;
76
76
77 
     @ApiModelProperty("材料属性02")
 77 
     @ApiModelProperty("材料属性02")
78 
-    private String attrib02;
78 
+    private String attrib_02;
79
79
80 
     @ApiModelProperty("材料属性03")
 80 
     @ApiModelProperty("材料属性03")
81 
-    private String attrib03;
81 
+    private String attrib_03;
82
82
83 
     @ApiModelProperty("材料属性04")
 83 
     @ApiModelProperty("材料属性04")
84 
-    private String attrib04;
84 
+    private String attrib_04;
85
85
86 
     @ApiModelProperty("材料属性05")
 86 
     @ApiModelProperty("材料属性05")
87 
-    private String attrib05;
87 
+    private String attrib_05;
88
88
89 
     @ApiModelProperty("材料属性06")
 89 
     @ApiModelProperty("材料属性06")
90 
-    private String attrib06;
90 
+    private String attrib_06;
91
91
92 
     @ApiModelProperty("材料属性07")
 92 
     @ApiModelProperty("材料属性07")
93 
-    private String attrib07;
93 
+    private String attrib_07;
94
94
95 
     @ApiModelProperty("材料属性08")
 95 
     @ApiModelProperty("材料属性08")
96 
-    private String attrib08;
96 
+    private String attrib_08;
97
97
98 
     @ApiModelProperty("材料属性09")
 98 
     @ApiModelProperty("材料属性09")
99 
-    private String attrib09;
99 
+    private String attrib_09;
100
100
101 
     @ApiModelProperty("材料属性10")
 101 
     @ApiModelProperty("材料属性10")
102 
-    private String attrib10;
102 
+    private String attrib_10;
103
103
104 
     @ApiModelProperty("材料属性11")
 104 
     @ApiModelProperty("材料属性11")
105 
-    private String attrib11;
105 
+    private String attrib_11;
106
106
107 
     @ApiModelProperty("材料属性12")
 107 
     @ApiModelProperty("材料属性12")
108 
-    private String attrib12;
108 
+    private String attrib_12;
109
109
110 
     @ApiModelProperty("材料属性13")
 110 
     @ApiModelProperty("材料属性13")
111 
-    private String attrib13;
111 
+    private String attrib_13;
112
112
113 
     @ApiModelProperty("材料属性14")
 113 
     @ApiModelProperty("材料属性14")
114 
-    private String attrib14;
114 
+    private String attrib_14;
115
115
116 
     @ApiModelProperty("材料属性15")
 116 
     @ApiModelProperty("材料属性15")
117 
-    private String attrib15;
117 
+    private String attrib_15;
118
118
119 
     @ApiModelProperty("材料属性16")
 119 
     @ApiModelProperty("材料属性16")
120 
-    private String attrib16;
120 
+    private String attrib_16;
121
121
122 
     @ApiModelProperty("材料属性17")
 122 
     @ApiModelProperty("材料属性17")
123 
-    private String attrib17;
123 
+    private String attrib_17;
124
124
125 
     @ApiModelProperty("材料属性18")
 125 
     @ApiModelProperty("材料属性18")
126 
-    private String attrib18;
126 
+    private String attrib_18;
127
127
128 
     @ApiModelProperty("材料属性19")
 128 
     @ApiModelProperty("材料属性19")
129 
-    private String attrib19;
129 
+    private String attrib_19;
130
130
131 
     @ApiModelProperty("材料属性20")
 131 
     @ApiModelProperty("材料属性20")
132 
-    private String attrib20;
132 
+    private String attrib_20;
133
133
134 
     @ApiModelProperty("材料属性21")
 134 
     @ApiModelProperty("材料属性21")
135 
-    private String attrib21;
135 
+    private String attrib_21;
136
136
137 
     @ApiModelProperty("材料属性22")
 137 
     @ApiModelProperty("材料属性22")
138 
-    private String attrib22;
138 
+    private String attrib_22;
139
139
140 
     @ApiModelProperty("材料属性23")
 140 
     @ApiModelProperty("材料属性23")
141 
-    private String attrib23;
141 
+    private String attrib_23;
142
142
143 
     @ApiModelProperty("材料属性24")
 143 
     @ApiModelProperty("材料属性24")
144 
-    private String attrib24;
144 
+    private String attrib_24;
145
145
146 
     @ApiModelProperty("材料属性25")
 146 
     @ApiModelProperty("材料属性25")
147 
-    private String attrib25;
147 
+    private String attrib_25;
148
148
149 
     @ApiModelProperty("备注信息1")
 149 
     @ApiModelProperty("备注信息1")
150 
-    private String remark1;
150 
+    private String remark_1;
151
151
152 
     @ApiModelProperty("备注信息2")
 152 
     @ApiModelProperty("备注信息2")
153 
-    private String remark2;
153 
+    private String remark_2;
154
154
155 
     @ApiModelProperty("备注信息3")
 155 
     @ApiModelProperty("备注信息3")
156 
-    private String remark3;
156 
+    private String remark_3;
157
157
158 
     @ApiModelProperty("备注信息4")
 158 
     @ApiModelProperty("备注信息4")
159 
-    private String remark4;
159 
+    private String remark_4;
160
160
161 
     @ApiModelProperty("备注信息5")
 161 
     @ApiModelProperty("备注信息5")
162 
-    private String remark5;
162 
+    private String remark_5;
163
163
164 
 }
 164 
 }
165
165

+ 30
- 30
sto/src/main/java/com/shinsoft/sto/model/ware/HProdMaster.java Прегледај датотеку

64 
     private String outFlag;
 64 
     private String outFlag;
65
65
66 
     @ApiModelProperty("材料属性01")
 66 
     @ApiModelProperty("材料属性01")
67 
-    private String attrib01;
67 
+    private String attrib_01;
68
68
69 
     @ApiModelProperty("材料属性02")
 69 
     @ApiModelProperty("材料属性02")
70 
-    private String attrib02;
70 
+    private String attrib_02;
71
71
72 
     @ApiModelProperty("材料属性03")
 72 
     @ApiModelProperty("材料属性03")
73 
-    private String attrib03;
73 
+    private String attrib_03;
74
74
75 
     @ApiModelProperty("材料属性04")
 75 
     @ApiModelProperty("材料属性04")
76 
-    private String attrib04;
76 
+    private String attrib_04;
77
77
78 
     @ApiModelProperty("材料属性05")
 78 
     @ApiModelProperty("材料属性05")
79 
-    private String attrib05;
79 
+    private String attrib_05;
80
80
81 
     @ApiModelProperty("材料属性06")
 81 
     @ApiModelProperty("材料属性06")
82 
-    private String attrib06;
82 
+    private String attrib_06;
83
83
84 
     @ApiModelProperty("材料属性07")
 84 
     @ApiModelProperty("材料属性07")
85 
-    private String attrib07;
85 
+    private String attrib_07;
86
86
87 
     @ApiModelProperty("材料属性08")
 87 
     @ApiModelProperty("材料属性08")
88 
-    private String attrib08;
88 
+    private String attrib_08;
89
89
90 
     @ApiModelProperty("材料属性09")
 90 
     @ApiModelProperty("材料属性09")
91 
-    private String attrib09;
91 
+    private String attrib_09;
92
92
93 
     @ApiModelProperty("材料属性10")
 93 
     @ApiModelProperty("材料属性10")
94 
-    private String attrib10;
94 
+    private String attrib_10;
95
95
96 
     @ApiModelProperty("材料属性11")
 96 
     @ApiModelProperty("材料属性11")
97 
-    private String attrib11;
97 
+    private String attrib_11;
98
98
99 
     @ApiModelProperty("材料属性12")
 99 
     @ApiModelProperty("材料属性12")
100 
-    private String attrib12;
100 
+    private String attrib_12;
101
101
102 
     @ApiModelProperty("材料属性13")
 102 
     @ApiModelProperty("材料属性13")
103 
-    private String attrib13;
103 
+    private String attrib_13;
104
104
105 
     @ApiModelProperty("材料属性14")
 105 
     @ApiModelProperty("材料属性14")
106 
-    private String attrib14;
106 
+    private String attrib_14;
107
107
108 
     @ApiModelProperty("材料属性15")
 108 
     @ApiModelProperty("材料属性15")
109 
-    private String attrib15;
109 
+    private String attrib_15;
110
110
111 
     @ApiModelProperty("材料属性16")
 111 
     @ApiModelProperty("材料属性16")
112 
-    private String attrib16;
112 
+    private String attrib_16;
113
113
114 
     @ApiModelProperty("材料属性17")
 114 
     @ApiModelProperty("材料属性17")
115 
-    private String attrib17;
115 
+    private String attrib_17;
116
116
117 
     @ApiModelProperty("材料属性18")
 117 
     @ApiModelProperty("材料属性18")
118 
-    private String attrib18;
118 
+    private String attrib_18;
119
119
120 
     @ApiModelProperty("材料属性19")
 120 
     @ApiModelProperty("材料属性19")
121 
-    private String attrib19;
121 
+    private String attrib_19;
122
122
123 
     @ApiModelProperty("材料属性20")
 123 
     @ApiModelProperty("材料属性20")
124 
-    private String attrib20;
124 
+    private String attrib_20;
125
125
126 
     @ApiModelProperty("材料属性21")
 126 
     @ApiModelProperty("材料属性21")
127 
-    private String attrib21;
127 
+    private String attrib_21;
128
128
129 
     @ApiModelProperty("材料属性22")
 129 
     @ApiModelProperty("材料属性22")
130 
-    private String attrib22;
130 
+    private String attrib_22;
131
131
132 
     @ApiModelProperty("材料属性23")
 132 
     @ApiModelProperty("材料属性23")
133 
-    private String attrib23;
133 
+    private String attrib_23;
134
134
135 
     @ApiModelProperty("材料属性24")
 135 
     @ApiModelProperty("材料属性24")
136 
-    private String attrib24;
136 
+    private String attrib_24;
137
137
138 
     @ApiModelProperty("材料属性25")
 138 
     @ApiModelProperty("材料属性25")
139 
-    private String attrib25;
139 
+    private String attrib_25;
140
140
141 
     @ApiModelProperty("备注信息1")
 141 
     @ApiModelProperty("备注信息1")
142 
-    private String remark1;
142 
+    private String remark_1;
143
143
144 
     @ApiModelProperty("备注信息2")
 144 
     @ApiModelProperty("备注信息2")
145 
-    private String remark2;
145 
+    private String remark_2;
146
146
147 
     @ApiModelProperty("备注信息3")
 147 
     @ApiModelProperty("备注信息3")
148 
-    private String remark3;
148 
+    private String remark_3;
149
149
150 
     @ApiModelProperty("备注信息4")
 150 
     @ApiModelProperty("备注信息4")
151 
-    private String remark4;
151 
+    private String remark_4;
152
152
153 
     @ApiModelProperty("备注信息5")
 153 
     @ApiModelProperty("备注信息5")
154 
-    private String remark5;
154 
+    private String remark_5;
155
155
156 
 }
 156 
 }
157
157

+ 30
- 30
sto/src/main/java/com/shinsoft/sto/model/ware/ProdMaster.java Прегледај датотеку

63 
     private String outFlag;
 63 
     private String outFlag;
64
64
65 
     @ApiModelProperty("材料属性01")
 65 
     @ApiModelProperty("材料属性01")
66 
-    private String attrib01;
66 
+    private String attrib_01;
67
67
68 
     @ApiModelProperty("材料属性02")
 68 
     @ApiModelProperty("材料属性02")
69 
-    private String attrib02;
69 
+    private String attrib_02;
70
70
71 
     @ApiModelProperty("材料属性03")
 71 
     @ApiModelProperty("材料属性03")
72 
-    private String attrib03;
72 
+    private String attrib_03;
73
73
74 
     @ApiModelProperty("材料属性04")
 74 
     @ApiModelProperty("材料属性04")
75 
-    private String attrib04;
75 
+    private String attrib_04;
76
76
77 
     @ApiModelProperty("材料属性05")
 77 
     @ApiModelProperty("材料属性05")
78 
-    private String attrib05;
78 
+    private String attrib_05;
79
79
80 
     @ApiModelProperty("材料属性06")
 80 
     @ApiModelProperty("材料属性06")
81 
-    private String attrib06;
81 
+    private String attrib_06;
82
82
83 
     @ApiModelProperty("材料属性07")
 83 
     @ApiModelProperty("材料属性07")
84 
-    private String attrib07;
84 
+    private String attrib_07;
85
85
86 
     @ApiModelProperty("材料属性08")
 86 
     @ApiModelProperty("材料属性08")
87 
-    private String attrib08;
87 
+    private String attrib_08;
88
88
89 
     @ApiModelProperty("材料属性09")
 89 
     @ApiModelProperty("材料属性09")
90 
-    private String attrib09;
90 
+    private String attrib_09;
91
91
92 
     @ApiModelProperty("材料属性10")
 92 
     @ApiModelProperty("材料属性10")
93 
-    private String attrib10;
93 
+    private String attrib_10;
94
94
95 
     @ApiModelProperty("材料属性11")
 95 
     @ApiModelProperty("材料属性11")
96 
-    private String attrib11;
96 
+    private String attrib_11;
97
97
98 
     @ApiModelProperty("材料属性12")
 98 
     @ApiModelProperty("材料属性12")
99 
-    private String attrib12;
99 
+    private String attrib_12;
100
100
101 
     @ApiModelProperty("材料属性13")
 101 
     @ApiModelProperty("材料属性13")
102 
-    private String attrib13;
102 
+    private String attrib_13;
103
103
104 
     @ApiModelProperty("材料属性14")
 104 
     @ApiModelProperty("材料属性14")
105 
-    private String attrib14;
105 
+    private String attrib_14;
106
106
107 
     @ApiModelProperty("材料属性15")
 107 
     @ApiModelProperty("材料属性15")
108 
-    private String attrib15;
108 
+    private String attrib_15;
109
109
110 
     @ApiModelProperty("材料属性16")
 110 
     @ApiModelProperty("材料属性16")
111 
-    private String attrib16;
111 
+    private String attrib_16;
112
112
113 
     @ApiModelProperty("材料属性17")
 113 
     @ApiModelProperty("材料属性17")
114 
-    private String attrib17;
114 
+    private String attrib_17;
115
115
116 
     @ApiModelProperty("材料属性18")
 116 
     @ApiModelProperty("材料属性18")
117 
-    private String attrib18;
117 
+    private String attrib_18;
118
118
119 
     @ApiModelProperty("材料属性19")
 119 
     @ApiModelProperty("材料属性19")
120 
-    private String attrib19;
120 
+    private String attrib_19;
121
121
122 
     @ApiModelProperty("材料属性20")
 122 
     @ApiModelProperty("材料属性20")
123 
-    private String attrib20;
123 
+    private String attrib_20;
124
124
125 
     @ApiModelProperty("材料属性21")
 125 
     @ApiModelProperty("材料属性21")
126 
-    private String attrib21;
126 
+    private String attrib_21;
127
127
128 
     @ApiModelProperty("材料属性22")
 128 
     @ApiModelProperty("材料属性22")
129 
-    private String attrib22;
129 
+    private String attrib_22;
130
130
131 
     @ApiModelProperty("材料属性23")
 131 
     @ApiModelProperty("材料属性23")
132 
-    private String attrib23;
132 
+    private String attrib_23;
133
133
134 
     @ApiModelProperty("材料属性24")
 134 
     @ApiModelProperty("材料属性24")
135 
-    private String attrib24;
135 
+    private String attrib_24;
136
136
137 
     @ApiModelProperty("材料属性25")
 137 
     @ApiModelProperty("材料属性25")
138 
-    private String attrib25;
138 
+    private String attrib_25;
139
139
140 
     @ApiModelProperty("备注信息1")
 140 
     @ApiModelProperty("备注信息1")
141 
-    private String remark1;
141 
+    private String remark_1;
142
142
143 
     @ApiModelProperty("备注信息2")
 143 
     @ApiModelProperty("备注信息2")
144 
-    private String remark2;
144 
+    private String remark_2;
145
145
146 
     @ApiModelProperty("备注信息3")
 146 
     @ApiModelProperty("备注信息3")
147 
-    private String remark3;
147 
+    private String remark_3;
148
148
149 
     @ApiModelProperty("备注信息4")
 149 
     @ApiModelProperty("备注信息4")
150 
-    private String remark4;
150 
+    private String remark_4;
151
151
152 
     @ApiModelProperty("备注信息5")
 152 
     @ApiModelProperty("备注信息5")
153 
-    private String remark5;
153 
+    private String remark_5;
154 
 }
 154 
 }
155
155

+ 6
- 6
sto/src/main/java/com/shinsoft/sto/model/ware/WareStoreQueryVO.java Прегледај датотеку

31 
     private String customerCompany;
 31 
     private String customerCompany;
32 
     private String prodNo;
 32 
     private String prodNo;
33 
     private String inTruckNo;
 33 
     private String inTruckNo;
34 
-    private String attrib01;
35 
-    private String attrib02;
36 
-    private String attrib03;
37 
-    private String attrib04;
38 
-    private String attrib05;
39 
-    private String remark1;
34 
+    private String attrib_01;
35 
+    private String attrib_02;
36 
+    private String attrib_03;
37 
+    private String attrib_04;
38 
+    private String attrib_05;
39 
+    private String remark_1;
40 
     private BigDecimal weight;
 40 
     private BigDecimal weight;
41 
     private BigDecimal quantity;
 41 
     private BigDecimal quantity;
42 
     private String outFlag;
 42 
     private String outFlag;

+ 25
- 39
sto/src/main/java/com/shinsoft/sto/service/impl/ware/ProdMasterServiceImpl.java Прегледај датотеку

10 
 import com.shinsoft.sto.model.ware.ProdMaster;
 10 
 import com.shinsoft.sto.model.ware.ProdMaster;
11 
 import com.shinsoft.sto.service.ware.ProdMasterService;
 11 
 import com.shinsoft.sto.service.ware.ProdMasterService;
12 
 import com.shinsoft.sto.model.system.ResultJSON;
 12 
 import com.shinsoft.sto.model.system.ResultJSON;
13 
+import org.springframework.beans.factory.annotation.Autowired;
13 
 import org.springframework.stereotype.Service;
 14 
 import org.springframework.stereotype.Service;
14 
 import org.springframework.beans.BeanUtils;
 15 
 import org.springframework.beans.BeanUtils;
15 
 import org.springframework.transaction.annotation.Transactional;
 16 
 import org.springframework.transaction.annotation.Transactional;
27 
 @Service
 28 
 @Service
28 
 public class ProdMasterServiceImpl extends ServiceImpl<ProdMasterMapper, ProdMaster> implements ProdMasterService {
 29 
 public class ProdMasterServiceImpl extends ServiceImpl<ProdMasterMapper, ProdMaster> implements ProdMasterService {
29
30
30 
-    ResultJSON resultJSON;
31 
-    private final ChangeRecordMapper changeRecordMapper;
32 
-
33 
-    public ProdMasterServiceImpl(ChangeRecordMapper changeRecordMapper) {
34 
-        this.changeRecordMapper = changeRecordMapper;
35 
-    }
31 
+    @Autowired
32 
+    private  ChangeRecordMapper changeRecordMapper;
36
33
37 
     @Override
 34 
     @Override
38 
     public ResultJSON query(int page, int rows, Map<String, Object> map) {
 35 
     public ResultJSON query(int page, int rows, Map<String, Object> map) {
62 
             // 记录旧数据到变更表
 59 
             // 记录旧数据到变更表
63 
             ChangeRecord record = new ChangeRecord();
 60 
             ChangeRecord record = new ChangeRecord();
64 
             BeanUtils.copyProperties(dbData, record);
 61 
             BeanUtils.copyProperties(dbData, record);
65 
-            record.setId(null);
66 
             changeRecordMapper.insert(record);
 62 
             changeRecordMapper.insert(record);
63 
+            //修改材料信息
64 
+            ProdMaster prodMaster1 = new ProdMaster();
65 
+            prodMaster1.setId(prodMaster.getId());
66 
+            prodMaster1.setQuantity(prodMaster.getQuantity());
67
67
68 
-            // 按需更新字段
69 
-            if (prodMaster.getQuantity() != null) {
70 
-                dbData.setQuantity(prodMaster.getQuantity());
71 
-            }
72 
-            if (prodMaster.getWeight() != null) {
73 
-                dbData.setWeight(prodMaster.getWeight());
74 
-            }
75 
-            if (prodMaster.getAttrib01() != null) {
76 
-                dbData.setAttrib01(prodMaster.getAttrib01());
77 
-            }
78 
-            if (prodMaster.getAttrib02() != null) {
79 
-                dbData.setAttrib02(prodMaster.getAttrib02());
80 
-            }
81 
-            if (prodMaster.getAttrib04() != null) {
82 
-                dbData.setAttrib04(prodMaster.getAttrib04());
83 
-            }
84 
-            if (prodMaster.getAttrib05() != null) {
85 
-                dbData.setAttrib05(prodMaster.getAttrib05());
86 
-            }
87 
-            if (prodMaster.getOwnerCompany() != null) {
88 
-                dbData.setOwnerCompany(prodMaster.getOwnerCompany());
89 
-            }
90 
-            if (prodMaster.getCustomerCompany() != null) {
91 
-                dbData.setCustomerCompany(prodMaster.getCustomerCompany());
92 
-            }
93 
-            if (prodMaster.getDeliveryAddress() != null) {
94 
-                dbData.setDeliveryAddress(prodMaster.getDeliveryAddress());
95 
-            }
96 
-            if (prodMaster.getRemark1() != null) {
97 
-                dbData.setRemark1(prodMaster.getRemark1());
98 
-            }
68 
+            prodMaster1.setWeight(prodMaster.getWeight());
69 
+
70 
+            prodMaster1.setAttrib_01(prodMaster.getAttrib_01());
71 
+
72 
+            prodMaster1.setAttrib_02(prodMaster.getAttrib_02());
73 
+
74 
+            prodMaster1.setAttrib_04(prodMaster.getAttrib_04());
75 
+
76 
+            prodMaster1.setAttrib_05(prodMaster.getAttrib_05());
77 
+
78 
+            prodMaster1.setOwnerCompany(prodMaster.getOwnerCompany());
79 
+
80 
+            prodMaster1.setCustomerCompany(prodMaster.getCustomerCompany());
81 
+
82 
+            prodMaster1.setDeliveryAddress(prodMaster.getDeliveryAddress());
83 
+
84 
+            prodMaster1.setRemark_1(prodMaster.getRemark_1());
99
85
100 
-            baseMapper.updateById(dbData);
86 
+            baseMapper.updateById(prodMaster1);
101 
             return ResultJSON.success(dbData);
 87 
             return ResultJSON.success(dbData);
102 
         } catch (Exception ex) {
 88 
         } catch (Exception ex) {
103 
             ex.printStackTrace();
 89 
             ex.printStackTrace();

Write Preview
Loading…
Откажи
Сачувај