Ver código fonte

集采订单同步销售订单、同步库存、同步销售价格

ms-blue 2 meses atrás
pai
commit
65275ab780

+ 1 - 1
src/main/java/com/jsh/erp/service/SyncTescoSystemService.java

@@ -596,7 +596,7 @@ public class SyncTescoSystemService {
         item.setUnitPrice(unitPrice);
         item.setTaxRate(BigDecimal.ONE);
         item.setTaxMoney(BigDecimal.ZERO);
-        item.setBatchNumber("");
+        item.setBatchNumber(material.getBatchNumber());
         item.setTaxLastMoney(unitPrice.multiply(operNumber));
         item.setAllPrice(unitPrice.multiply(operNumber));
         return item;

+ 4 - 1
src/main/java/com/jsh/erp/service/impl/DepotHeadServiceImpl.java

@@ -1013,7 +1013,10 @@ public class DepotHeadServiceImpl extends ServiceImpl<DepotHeadMapper, DepotHead
                 if(materialsListMap!=null) {
                     dh.setMaterialsList(materialsListMap.get(dh.getId()));
                 }
-                dh.setCreatorName(userService.getUser(dh.getCreator()).getUsername());
+                User creatorUser = userService.getUser(dh.getCreator());
+                if(creatorUser != null){
+                    dh.setCreatorName(creatorUser.getUsername());
+                }
                 resList.add(dh);
             }
         }catch(Exception e){

+ 0 - 1
src/main/java/com/jsh/erp/service/impl/DepotItemServiceImpl.java

@@ -847,7 +847,6 @@ public class DepotItemServiceImpl extends ServiceImpl<DepotItemMapper, DepotItem
                         depotItem.setBasicNumber(oNumber); // 其他情况
                     }
                 }
-                this.insertDepotItemWithObj(depotItem);
                 depotItem.setHeaderId(depotHead.getId());
                 this.insertDepotItem(depotItem);
                 // 更新当前库存