浏览代码

优化销售订单 手动同步

liuchaohui 2 年之前
父节点
当前提交
70dbd82ed7

+ 3 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/controller/SySOAndOMController.java

@@ -151,8 +151,10 @@ public class SySOAndOMController extends JeecgController<SySOAndOM, ISySOAndOMSe
             }
             syOrderDataItemService.save(syOrderDataItem);
         }
+        syOrderData.setFlag(1);
+        syOrderData.setId(syOrderData.getAccount()+syOrderData.getId());
         syOrderDataService.save(syOrderData);
-        //回写U8
+        //回写U8 手动拉取为 同步字段状态值为 2
         sySOAndOMService.updateSO(sySOAndOM.get(0));
         return Result.OK("同步成功!!!");
     }

+ 3 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/entity/SyOrderData.java

@@ -199,6 +199,9 @@ public class SyOrderData {
 	@ApiModelProperty(value = "成衣件数")
 	private java.math.BigDecimal garmentNmb;
 
+	//同步状态 1手动 0自动(默认)
+	private int flag;
+
 	/*接受 成衣面辅料判断*/
 	@TableField(exist = false)
 	private java.lang.String isProduct;

+ 3 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/mapper/xml/SySOAndOMMapper.xml

@@ -193,13 +193,13 @@
 
     <update id="updateSO" >
         <if test="sy.account =='901'">
-            UPDATE UFDATA_901_2021.dbo.SO_SOMain SET cdefine15 = '0' WHERE cSOCode = #{sy.orderNumber}
+            UPDATE UFDATA_901_2021.dbo.SO_SOMain SET cdefine15 = '2' WHERE cSOCode = #{sy.orderNumber}
         </if>
         <if test="sy.account =='902'">
-            UPDATE UFDATA_902_2021.dbo.SO_SOMain SET cdefine15 = '0' WHERE cSOCode = #{sy.orderNumber}
+            UPDATE UFDATA_902_2021.dbo.SO_SOMain SET cdefine15 = '2' WHERE cSOCode = #{sy.orderNumber}
         </if>
         <if test="sy.account =='903'">
-            UPDATE UFDATA_903_2021.dbo.SO_SOMain SET cdefine15 = '0' WHERE cSOCode = #{sy.orderNumber}
+            UPDATE UFDATA_903_2021.dbo.SO_SOMain SET cdefine15 = '2' WHERE cSOCode = #{sy.orderNumber}
         </if>
     </update>