修改出入库单实体类

applications/purchase/purchase-dto/src/main/java/com/usoftchina/saas/purchase/dto/ProdInOutDTO.java

@@ -35,13 +35,15 @@ public class ProdInOutDTO extends CommonBaseDTO implements Serializable {
 
     private String pi_pucode;
 
-    private Integer pi_said;
+    private Long pi_said;
 
     private String pi_sacode;
 
     private Double pi_total;
 
-    private Integer pi_recordmanid;
+    private Double pi_nettotal;
+
+    private Long pi_recordmanid;
 
     private String pi_recordman;
 
@@ -75,4 +77,8 @@ public class ProdInOutDTO extends CommonBaseDTO implements Serializable {
 
     private Long pi_ioid;
 
+    private String pi_macode;
+
+    private Long pi_maid;
+
 }

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/po/ProdInOut.java

@@ -8,6 +8,7 @@ import java.util.Date;
 @Data
 public class ProdInOut extends CommonBaseEntity implements Serializable {
 
+
     private String pi_inoutno;
 
     private String pi_class;
@@ -30,13 +31,15 @@ public class ProdInOut extends CommonBaseEntity implements Serializable {
 
     private String pi_pucode;
 
-    private Integer pi_said;
+    private Long pi_said;
 
     private String pi_sacode;
 
     private Double pi_total;
 
-    private Integer pi_recordmanid;
+    private Double pi_nettotal;
+
+    private Long pi_recordmanid;
 
     private String pi_recordman;
 
@@ -70,4 +73,8 @@ public class ProdInOut extends CommonBaseEntity implements Serializable {
 
     private Long pi_ioid;
 
+    private String pi_macode;
+
+    private Long pi_maid;
+
 }

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/impl/PurchaseServiceImpl.java

@@ -486,8 +486,6 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
                 purchasedetailMapper.updateByPrimaryKeySelective(purchaseDetail);
             }
         }
-        //更新默认仓库
-//        prodInOutService.getDefaultWarehouseByProduct(pi_id);
         //采购验收单相关计算
         prodInOutService.calcProdInout(pi_id,"采购验收单");
         DocBaseDTO baseDTO = new DocBaseDTO(pi_id, piInoutno, BillCodeSeq.PURCHASEIN.getName());
@@ -510,7 +508,7 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         purchase.setPu_acceptstatuscode(Status.UNAUDITED.name());
         purchase.setUpdateTime(new Date());
         purchase.setUpdaterId(BaseContextHolder.getUserId());
-        getMapper().updateByPrimaryKey(purchase);
+        getMapper().updateByPrimaryKeySelective(purchase);
         //更新存在字段
         //日志
         messageLogService.audit(docBaseDTO);

applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/dto/ProdInOutDTO.java

@@ -33,7 +33,7 @@ public class ProdInOutDTO extends CommonBaseDTO implements Serializable {
 
     private String pi_custname;
 
-    private Integer pi_puid;
+    private Long pi_puid;
 
     private String pi_pucode;
 
@@ -43,7 +43,9 @@ public class ProdInOutDTO extends CommonBaseDTO implements Serializable {
 
     private Double pi_total;
 
-    private Integer pi_recordmanid;
+    private Double pi_nettotal;
+
+    private Long pi_recordmanid;
 
     private String pi_recordman;
 

applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/po/ProdInOut.java

@@ -31,13 +31,15 @@ public class ProdInOut extends CommonBaseEntity implements Serializable {
 
     private String pi_pucode;
 
-    private Integer pi_said;
+    private Long pi_said;
 
     private String pi_sacode;
 
     private Double pi_total;
 
-    private Integer pi_recordmanid;
+    private Double pi_nettotal;
+
+    private Long pi_recordmanid;
 
     private String pi_recordman;
 

applications/storage/storage-server/src/main/java/com/usoftchina/saas/storage/service/impl/ProdInOutServiceImpl.java

@@ -131,8 +131,6 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         prodInOut.setCreatorId(userId);
         prodInOut.setCreateTime(prodInOut.getPi_recorddate()==null?new Date():prodInOut.getPi_recorddate());
         prodInOut.setPi_date(prodInOut.getPi_date()==null?new Date():prodInOut.getPi_date());
-        prodInOut.setPi_puid(main.getPi_puid());
-        prodInOut.setPi_pucode(main.getPi_pucode());
         //编号获取
         pi_inoutno = pushMaxnubmer(prodInOut);
         prodInOut.setPi_inoutno(pi_inoutno);