Merge remote-tracking branch 'origin/master'

op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOrderMapper.java

@@ -68,4 +68,6 @@ public interface OdsProcureOrderMapper {
     void updateOdsProcureOrderAddOperationNumber(OdsProcureOrder odsProcureOrder);
 
     List<OdsProcureOrder> selectOdsProcureOrderAlreadyReaderList(OdsProcureOrder odsProcureOrder);
+
+    void updateOdsProcureOrderByProcureCode(OdsProcureOrder odsProcureOrder);
 }

op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java

@@ -810,6 +810,11 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
             order.setActive("1");
             List<OdsProcureOrder> orderList = odsProcureOrderMapper.selectOdsProcureOrderList(order);
             if (orderList.size() > 0) {
+                //这个地方判断下是不是采购单已经被插入了，如果是的话，并且是走的送货单的路径，那就把送货单给她附上
+                if (odsProcureOrder.getUserDefined5()!=null){
+                    order.setUserDefined5(mainId);
+                    odsProcureOrderMapper.updateOdsProcureOrderByProcureCode(order);
+                }
                 continue;
             }
             order.setUserDefined5(mainId);//送货单
@@ -912,8 +917,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
             //取ｓａｐ仓库号
                 SapBackflushMPQuery sapBackflushMPQuery = new SapBackflushMPQuery();
                 sapBackflushMPQuery.setPlant(odsProcureOutOrder.getSiteCode());     //工厂
-                String lgort = baseWarehouseMapper.selectByCode(odsProcureOutOrder.getLocCode());
-                sapBackflushMPQuery.setLgort(lgort);//库存地点
+                sapBackflushMPQuery.setLgort("0013");//反冲0013
                 sapBackflushMPQuery.setMatnr(odsProcureOutOrder.getMaterialCode());//物料号
                 sapBackflushMPQuery.setQuantity(odsProcureOutOrder.getOutNumber().toString());  //数量
                 sapBackflushMPQuery.setMeins(odsProcureOutOrder.getUnit()); //基本计量单位

op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml

@@ -234,4 +234,15 @@
         <if test="materialCode != null  and materialCode != ''">and Material_Code = #{materialCode}</if>
 
     </select>
+    <select id="updateOdsProcureOrderByProcureCode"    parameterType="OdsProcureOrder">
+        update ods_procure_order
+        SET User_Defined5 =  #{userDefined5}
+        where Procure_Code=  #{procureCode}
+          and  Site_code=     #{siteCode}
+          and   Material_Code=  #{materialCode}
+          and    Material_Desc=  #{materialDesc}
+          and  Active=   #{Active}
+
+    </select>
 </mapper>
+