Преглед на файлове

规范make,prodinout字段

zhoudw преди 7 години
родител
ревизия
1d79f22ad4
променени са 22 файла, в които са добавени 25 реда и са изтрити 161 реда
  1. 0 6
      applications/purchase/purchase-dto/src/main/java/com/usoftchina/saas/purchase/dto/ProdInOutDTO.java
  2. 1 7
      applications/purchase/purchase-dto/src/main/java/com/usoftchina/saas/purchase/dto/ProdInOutListDTO.java
  3. 0 6
      applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/po/ProdInOut.java
  4. 0 6
      applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/po/ProdInOutList.java
  5. 0 2
      applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/impl/PurchaseServiceImpl.java
  6. 0 3
      applications/purchase/purchase-server/src/main/resources/mapper/ProdIODetailMapper.xml
  7. 0 6
      applications/purchase/purchase-server/src/main/resources/mapper/ProdInOutListMapper.xml
  8. 1 26
      applications/purchase/purchase-server/src/main/resources/mapper/ProdInOutMapper.xml
  9. 0 3
      applications/purchase/purchase-server/src/main/resources/mapper/PurchaseListMapper.xml
  10. 1 1
      applications/purchase/purchase-server/src/main/resources/mapper/PurchaseReportMapper.xml
  11. 0 3
      applications/purchase/purchase-server/src/main/resources/mapper/PurchasedetailMapper.xml
  12. 0 6
      applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/dto/ProdInOutDTO.java
  13. 0 6
      applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/dto/ProdInOutListDTO.java
  14. 0 6
      applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/po/ProdInOut.java
  15. 0 6
      applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/po/ProdInOutList.java
  16. 16 15
      applications/storage/storage-server/src/main/java/com/usoftchina/saas/storage/service/impl/MakeServiceImpl.java
  17. 0 5
      applications/storage/storage-server/src/main/java/com/usoftchina/saas/storage/service/impl/ProdInOutServiceImpl.java
  18. 0 2
      applications/storage/storage-server/src/main/resources/mapper/MakeMapper.xml
  19. 5 8
      applications/storage/storage-server/src/main/resources/mapper/MakematerialMapper.xml
  20. 0 3
      applications/storage/storage-server/src/main/resources/mapper/ProdIODetailMapper.xml
  21. 0 6
      applications/storage/storage-server/src/main/resources/mapper/ProdInOutListMapper.xml
  22. 1 29
      applications/storage/storage-server/src/main/resources/mapper/ProdInOutMapper.xml

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

@@ -43,12 +43,6 @@ public class ProdInOutDTO extends CommonBaseDTO implements Serializable {
 
     private Double pi_nettotal;
 
-    private Long pi_recordmanid;
-
-    private String pi_recordman;
-
-    private Date pi_recorddate;
-
     private String pi_status;
 
     private String pi_statuscode;

+ 1 - 7
applications/purchase/purchase-dto/src/main/java/com/usoftchina/saas/purchase/dto/ProdInOutListDTO.java

@@ -40,13 +40,7 @@ public class ProdInOutListDTO extends CommonBaseDTO implements Serializable {
     private String pi_sacode;
 
     private Double pi_total;
-
-    private Integer pi_recordmanid;
-
-    private String pi_recordman;
-
-    private Date pi_recorddate;
-
+    
     private String pi_status;
 
     private String pi_statuscode;

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

@@ -39,12 +39,6 @@ public class ProdInOut extends CommonBaseEntity implements Serializable {
 
     private Double pi_nettotal;
 
-    private Long pi_recordmanid;
-
-    private String pi_recordman;
-
-    private Date pi_recorddate;
-
     private String pi_status;
 
     private String pi_statuscode;

+ 0 - 6
applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/po/ProdInOutList.java

@@ -40,12 +40,6 @@ public class ProdInOutList extends CommonBaseEntity{
 
     private Double pi_total;
 
-    private Integer pi_recordmanid;
-
-    private String pi_recordman;
-
-    private Date pi_recorddate;
-
     private String pi_status;
 
     private String pi_statuscode;

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

@@ -432,7 +432,6 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         prodInOut.setPi_date(new Date());
         prodInOut.setPi_status("未审核");
         prodInOut.setPi_statuscode("UNAUDITED");
-        prodInOut.setPi_recorddate(new Date());
         prodInOut.setPi_vendid(purchase.getPu_vendid());
         prodInOut.setPi_vendcode(purchase.getPu_vendcode());
         prodInOut.setPi_vendname(purchase.getPu_vendname());
@@ -441,7 +440,6 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         //设置付款状态
         prodInOut.setPi_prstatus(Status.PAYNONE.getDisplay());
         prodInOut.setPi_prstatuscode(Status.PAYNONE.name());
-
         //设置公司id
         prodInOut.setCompanyId(purchase.getCompanyId());
         prodInOut.setCreatorId(userId);

+ 0 - 3
applications/purchase/purchase-server/src/main/resources/mapper/ProdIODetailMapper.xml

@@ -62,9 +62,6 @@
       <result column="pr_vendid" property="pr_vendid"/>
       <result column="pr_vendname" property="pr_vendname"/>
       <result column="pr_vendcode" property="pr_vendcode"/>
-      <result column="pr_docdate" property="pr_docdate"/>
-      <result column="pr_recordmanid" property="pr_recordmanid"/>
-      <result column="pr_recordman" property="pr_recordman"/>
       <result column="pr_status" property="pr_status"/>
       <result column="pr_statuscode" property="pr_statuscode"/>
       <result column="pr_text1" property="pr_text1"/>

+ 0 - 6
applications/purchase/purchase-server/src/main/resources/mapper/ProdInOutListMapper.xml

@@ -17,9 +17,6 @@
     <result column="pi_said" jdbcType="INTEGER" property="pi_said" />
     <result column="pi_sacode" jdbcType="VARCHAR" property="pi_sacode" />
     <result column="pi_total" jdbcType="DOUBLE" property="pi_total" />
-    <result column="pi_recordmanid" jdbcType="INTEGER" property="pi_recordmanid" />
-    <result column="pi_recordman" jdbcType="VARCHAR" property="pi_recordman" />
-    <result column="pi_recorddate" jdbcType="TIMESTAMP" property="pi_recorddate" />
     <result column="pi_status" jdbcType="VARCHAR" property="pi_status" />
     <result column="pi_statuscode" jdbcType="VARCHAR" property="pi_statuscode" />
     <result column="pi_printstatus" jdbcType="VARCHAR" property="pi_printstatus" />
@@ -96,9 +93,6 @@
     <result column="pr_vendid" property="pr_vendid"/>
     <result column="pr_vendname" property="pr_vendname"/>
     <result column="pr_vendcode" property="pr_vendcode"/>
-    <result column="pr_docdate" property="pr_docdate"/>
-    <result column="pr_recordmanid" property="pr_recordmanid"/>
-    <result column="pr_recordman" property="pr_recordman"/>
     <result column="pr_status" property="pr_status"/>
     <result column="pr_statuscode" property="pr_statuscode"/>
     <result column="pr_text1" property="pr_text1"/>

+ 1 - 26
applications/purchase/purchase-server/src/main/resources/mapper/ProdInOutMapper.xml

@@ -17,9 +17,6 @@
     <result column="pi_said" jdbcType="INTEGER" property="pi_said" />
     <result column="pi_sacode" jdbcType="VARCHAR" property="pi_sacode" />
     <result column="pi_total" jdbcType="DOUBLE" property="pi_total" />
-    <result column="pi_recordmanid" jdbcType="INTEGER" property="pi_recordmanid" />
-    <result column="pi_recordman" jdbcType="VARCHAR" property="pi_recordman" />
-    <result column="pi_recorddate" jdbcType="TIMESTAMP" property="createTime" />
     <result column="pi_status" jdbcType="VARCHAR" property="pi_status" />
     <result column="pi_statuscode" jdbcType="VARCHAR" property="pi_statuscode" />
     <result column="pi_printstatus" jdbcType="VARCHAR" property="pi_printstatus" />
@@ -52,8 +49,7 @@
 
   <sql id="Base_Column_List">
     pi_id, pi_inoutno, pi_class, pi_date, pi_vendid, pi_vendcode, pi_vendname, pi_custid, 
-    pi_custcode, pi_custname, pi_puid, pi_pucode, pi_said, pi_sacode, pi_total, pi_recordmanid, 
-    pi_recordman, pi_recorddate, pi_status, pi_statuscode, pi_printstatus, pi_printstatuscode, 
+    pi_custcode, pi_custname, pi_puid, pi_pucode, pi_said, pi_sacode, pi_total, pi_status, pi_statuscode, pi_printstatus, pi_printstatuscode,
     companyid, updaterid,updaterName,updatetime,creatorid,creatorName,createtime, pi_text1, pi_text2, pi_text3, pi_text4, pi_text5,pi_auditdate,
     pi_auditman,pi_remark,pi_ioid,pi_iocode,pi_prstatus,pi_prstatuscode
   </sql>
@@ -123,12 +119,6 @@
       <if test="pi_total != null">
         pi_total,
       </if>
-      <if test="pi_recordmanid != null">
-        pi_recordmanid,
-      </if>
-      <if test="pi_recordman != null">
-        pi_recordman,
-      </if>
       <if test="pi_status != null">
         pi_status,
       </if>
@@ -247,12 +237,6 @@
       <if test="pi_total != null">
         #{pi_total,jdbcType=DOUBLE},
       </if>
-      <if test="pi_recordmanid != null">
-        #{pi_recordmanid,jdbcType=INTEGER},
-      </if>
-      <if test="pi_recordman != null">
-        #{pi_recordman,jdbcType=VARCHAR},
-      </if>
       <if test="pi_status != null">
         #{pi_status,jdbcType=VARCHAR},
       </if>
@@ -375,15 +359,6 @@
       <if test="pi_total != null">
         pi_total = #{pi_total,jdbcType=DOUBLE},
       </if>
-      <if test="pi_recordmanid != null">
-        pi_recordmanid = #{pi_recordmanid,jdbcType=INTEGER},
-      </if>
-      <if test="pi_recordman != null">
-        pi_recordman = #{pi_recordman,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        pi_recorddate = #{createTime,jdbcType=TIMESTAMP},
-      </if>
       <if test="pi_status != null">
         pi_status = #{pi_status,jdbcType=VARCHAR},
       </if>

+ 0 - 3
applications/purchase/purchase-server/src/main/resources/mapper/PurchaseListMapper.xml

@@ -78,9 +78,6 @@
         <result column="pr_vendid" property="pr_vendid"/>
         <result column="pr_vendname" property="pr_vendname"/>
         <result column="pr_vendcode" property="pr_vendcode"/>
-        <result column="pr_docdate" property="pr_docdate"/>
-        <result column="pr_recordmanid" property="pr_recordmanid"/>
-        <result column="pr_recordman" property="pr_recordman"/>
         <result column="pr_status" property="pr_status"/>
         <result column="pr_statuscode" property="pr_statuscode"/>
         <result column="pr_text1" property="pr_text1"/>

+ 1 - 1
applications/purchase/purchase-server/src/main/resources/mapper/PurchaseReportMapper.xml

@@ -17,7 +17,7 @@
 
     <result column="creatorid" property="creatorId" jdbcType="INTEGER"/>
     <result column="createtime" property="createTime" jdbcType="TIMESTAMP" />
-    <result column="creator" property="creator" jdbcType="VARCHAR" />
+    <result column="creator" property="creatorName" jdbcType="VARCHAR" />
   </resultMap>
   <resultMap id="ListMap" type="com.usoftchina.saas.purchase.po.report.PurchaseReportDetail">
     <id column="pu_id" property="pu_id" jdbcType="INTEGER" />

+ 0 - 3
applications/purchase/purchase-server/src/main/resources/mapper/PurchasedetailMapper.xml

@@ -50,9 +50,6 @@
       <result column="pr_vendid" property="pr_vendid"/>
       <result column="pr_vendname" property="pr_vendname"/>
       <result column="pr_vendcode" property="pr_vendcode"/>
-      <result column="pr_docdate" property="pr_docdate"/>
-      <result column="pr_recordmanid" property="pr_recordmanid"/>
-      <result column="pr_recordman" property="pr_recordman"/>
       <result column="pr_status" property="pr_status"/>
       <result column="pr_statuscode" property="pr_statuscode"/>
       <result column="pr_text1" property="pr_text1"/>

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

@@ -45,12 +45,6 @@ public class ProdInOutDTO extends CommonBaseDTO implements Serializable {
 
     private Double pi_nettotal;
 
-    private Long pi_recordmanid;
-
-    private String pi_recordman;
-
-    private Date pi_recorddate;
-
     private String pi_status;
 
     private String pi_statuscode;

+ 0 - 6
applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/dto/ProdInOutListDTO.java

@@ -41,12 +41,6 @@ public class ProdInOutListDTO extends CommonBaseEntity implements Serializable {
 
     private Double pi_total;
 
-    private Long pi_recordmanid;
-
-    private String pi_recordman;
-
-    private Date pi_recorddate;
-
     private String pi_status;
 
     private String pi_statuscode;

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

@@ -39,12 +39,6 @@ public class ProdInOut extends CommonBaseEntity implements Serializable {
 
     private Double pi_nettotal;
 
-    private Long pi_recordmanid;
-
-    private String pi_recordman;
-
-    private Date pi_recorddate;
-
     private String pi_status;
 
     private String pi_statuscode;

+ 0 - 6
applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/po/ProdInOutList.java

@@ -40,12 +40,6 @@ public class ProdInOutList extends CommonBaseEntity{
 
     private Double pi_total;
 
-    private Long pi_recordmanid;
-
-    private String pi_recordman;
-
-    private Date pi_recorddate;
-
     private String pi_status;
 
     private String pi_statuscode;

+ 16 - 15
applications/storage/storage-server/src/main/java/com/usoftchina/saas/storage/service/impl/MakeServiceImpl.java

@@ -353,6 +353,11 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
         Make make = makeListDTO.getMain();
         Long ma_id = make.getId();
         List<MakeMaterial> items = makeListDTO.getItems();
+        //公司ID
+        Long companyId = BaseContextHolder.getCompanyId();
+        //人员Id
+        Long userId = BaseContextHolder.getUserId();
+        String userName = BaseContextHolder.getUserName();
         Result res = null;
         Object result =  null;
         if ("组装".equals(make.getMa_type())){
@@ -363,18 +368,17 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
             String code = maxnumberService.getMaxnumber("MakeOut", true).getData();
             prodInOut.setPi_inoutno(code);
             prodInOut.setPi_date(new Date());       //出入库日期
-            prodInOut.setPi_recorddate(new Date());     //录入日期
             prodInOut.setPi_auditdate(new Date());      //审核日期
             prodInOut.setPi_auditman("");               //审核人
             prodInOut.setPi_status(Status.UNAUDITED.getDisplay());  //单据状态
             prodInOut.setPi_statuscode(Status.UNAUDITED.name());    //单据状态码
             prodInOut.setPi_macode(make.getMa_code());       //制造单号
             prodInOut.setPi_maid(make.getId());             //制造单ID
-            prodInOut.setCompanyId(BaseContextHolder.getCompanyId());   //公司ID
-            prodInOut.setCreateTime(new Date());
-            prodInOut.setCreatorId(BaseContextHolder.getUserId());      //创建人ID
+            prodInOut.setCompanyId(companyId);   //公司ID
             prodInOutMapper.insertSelective(prodInOut);
             long pi_id = prodInOut.getId();
+            //更新录入人
+            prodInOutMapper.updateCreator(userId, userName, pi_id);
             //b.从表
             List<ProdIODetail> prodIODetailList = new ArrayList<ProdIODetail>();
             int detno = 0;
@@ -422,19 +426,18 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
             code = maxnumberService.getMaxnumber("MakeIn", true).getData();
             prodInOut.setPi_inoutno(code);
             prodInOut.setPi_date(new Date());       //出入库日期
-            prodInOut.setPi_recorddate(new Date());     //录入日期
             prodInOut.setPi_auditdate(new Date());      //审核日期
             prodInOut.setPi_auditman("");               //审核人
             prodInOut.setPi_status(Status.UNAUDITED.getDisplay());  //单据状态
             prodInOut.setPi_statuscode(Status.UNAUDITED.name());    //单据状态码
             prodInOut.setPi_macode(make.getMa_code());       //制造单号
             prodInOut.setPi_maid(make.getId());             //制造单ID
-            prodInOut.setCompanyId(BaseContextHolder.getCompanyId());   //公司ID
-            prodInOut.setCreateTime(new Date());
-            prodInOut.setCreatorId(BaseContextHolder.getUserId());      //创建人ID
+            prodInOut.setCompanyId(companyId);   //公司ID
             prodInOut.setPi_total(make.getMa_total());
             prodInOutMapper.insertSelective(prodInOut);
             pi_id = prodInOut.getId();
+            //更新录入人
+            prodInOutMapper.updateCreator(userId, userName, pi_id);
             //b.从表
             ProdIODetail prodIODetail = new ProdIODetail();
             prodIODetail.setPd_piid(pi_id);     //主表ID
@@ -474,18 +477,17 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
             String code = maxnumberService.getMaxnumber("MakeOut", true).getData();
             prodInOut.setPi_inoutno(code);
             prodInOut.setPi_date(new Date());       //出入库日期
-            prodInOut.setPi_recorddate(new Date());     //录入日期
             prodInOut.setPi_auditdate(new Date());      //审核日期
             prodInOut.setPi_auditman("");               //审核人
             prodInOut.setPi_status(Status.UNAUDITED.getDisplay());  //单据状态
             prodInOut.setPi_statuscode(Status.UNAUDITED.name());    //单据状态码
             prodInOut.setPi_macode(make.getMa_code());       //制造单号
             prodInOut.setPi_maid(make.getId());             //制造单ID
-            prodInOut.setCompanyId(BaseContextHolder.getCompanyId());   //公司ID
-            prodInOut.setCreateTime(new Date());
-            prodInOut.setCreatorId(BaseContextHolder.getUserId());      //创建人ID
+            prodInOut.setCompanyId(companyId);   //公司ID
             prodInOutMapper.insertSelective(prodInOut);
             long pi_id = prodInOut.getId();
+            //更新录入人
+            prodInOutMapper.updateCreator(userId, userName, pi_id);
             //b.从表
             ProdIODetail prodIODetail = new ProdIODetail();
             prodIODetail.setPd_piid(pi_id);     //主表ID
@@ -534,7 +536,6 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
             code = maxnumberService.getMaxnumber("MakeIn", true).getData();
             prodInOut.setPi_inoutno(code);
             prodInOut.setPi_date(new Date());       //出入库日期
-            prodInOut.setPi_recorddate(new Date());     //录入日期
             prodInOut.setPi_auditdate(new Date());      //审核日期
             prodInOut.setPi_auditman("");               //审核人
             prodInOut.setPi_status(Status.UNAUDITED.getDisplay());  //单据状态
@@ -542,10 +543,10 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
             prodInOut.setPi_macode(make.getMa_code());       //制造单号
             prodInOut.setPi_maid(make.getId());             //制造单ID
             prodInOut.setCompanyId(BaseContextHolder.getCompanyId());   //公司ID
-            prodInOut.setCreateTime(new Date());
-            prodInOut.setCreatorId(BaseContextHolder.getUserId());      //创建人ID
             prodInOutMapper.insertSelective(prodInOut);
             pi_id = prodInOut.getId();
+            //更新录入人
+            prodInOutMapper.updateCreator(userId, userName, pi_id);
             //计算完工入库单主表金额
             prodIODetailMapper.calcProdIn(pi_id);
             //b.从表

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

@@ -113,8 +113,6 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         //人员Id
         Long userId = BaseContextHolder.getUserId();
         String userName = BaseContextHolder.getUserName();
-
-
         //获取主表信息
         ProdInOutDTO main = formdata.getMain();
         List<ProdIODetailDTO> items = formdata.getItems();
@@ -128,8 +126,6 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         String pi_class = main.getPi_class();
         ProdInOut prodInOut = BeanMapper.map(main,ProdInOut.class);
         prodInOut.setCompanyId(companyId);
-        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());
         //编号获取
         pi_inoutno = pushMaxnubmer(prodInOut);
@@ -150,7 +146,6 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
                 detail.setCompanyId(companyId);
                 detail.setCreatorId(userId);
                 detail.setCreateTime(new Date());
-
                 insertDetails.add(detail);
             }
             //插入从表

+ 0 - 2
applications/storage/storage-server/src/main/resources/mapper/MakeMapper.xml

@@ -53,8 +53,6 @@
     <result column="pi_said" jdbcType="INTEGER" property="pi_said" />
     <result column="pi_sacode" jdbcType="VARCHAR" property="pi_sacode" />
     <result column="pi_total" jdbcType="DOUBLE" property="pi_total" />
-    <result column="pi_recordmanid" jdbcType="INTEGER" property="pi_recordmanid" />
-    <result column="pi_recordman" jdbcType="VARCHAR" property="pi_recordman" />
     <result column="pi_recorddate" jdbcType="TIMESTAMP" property="createTime" />
     <result column="pi_status" jdbcType="VARCHAR" property="pi_status" />
     <result column="pi_statuscode" jdbcType="VARCHAR" property="pi_statuscode" />

+ 5 - 8
applications/storage/storage-server/src/main/resources/mapper/MakematerialMapper.xml

@@ -39,9 +39,6 @@
         <result column="pr_vendid" property="pr_vendid" jdbcType="INTEGER" />
         <result column="pr_vendcode" property="pr_vendcode" jdbcType="VARCHAR" />
         <result column="pr_vendname" property="pr_vendname" jdbcType="VARCHAR" />
-        <result column="pr_docdate" property="pr_docdate" jdbcType="TIMESTAMP" />
-        <result column="pr_recordmanid" property="pr_recordmanid" jdbcType="INTEGER" />
-        <result column="pr_recordman" property="pr_recordman" jdbcType="VARCHAR" />
         <result column="pr_status" property="pr_status" jdbcType="VARCHAR" />
         <result column="pr_statuscode" property="pr_statuscode" jdbcType="VARCHAR" />
         <result column="updateTime" property="updateTime" jdbcType="TIMESTAMP" />
@@ -100,9 +97,9 @@
       <if test="mm_whcode != null" >
         mm_whcode,
       </if>
-        <if test="mm_whname != null" >
-            mm_whname,
-        </if>
+      <if test="mm_whname != null" >
+          mm_whname,
+      </if>
       <if test="mm_price != null" >
         mm_price,
       </if>
@@ -151,7 +148,7 @@
         #{mm_whcode,jdbcType=VARCHAR},
       </if>
       <if test="mm_whname != null" >
-          #{mm_whname,jdbcType=VARCHAR},
+        #{mm_whname,jdbcType=VARCHAR},
       </if>
       <if test="mm_price != null" >
         #{mm_price,jdbcType=DOUBLE},
@@ -304,7 +301,7 @@
           mm_whcode = #{item.mm_whcode,jdbcType=VARCHAR},
         </if>
         <if test="item.mm_whname != null" >
-            mm_whname = #{item.mm_whname,jdbcType=VARCHAR},
+          mm_whname = #{item.mm_whname,jdbcType=VARCHAR},
         </if>
         <if test="item.mm_price != null" >
           mm_price = #{item.mm_price,jdbcType=DOUBLE},

+ 0 - 3
applications/storage/storage-server/src/main/resources/mapper/ProdIODetailMapper.xml

@@ -62,9 +62,6 @@
       <result column="pr_vendid" property="pr_vendid"/>
       <result column="pr_vendname" property="pr_vendname"/>
       <result column="pr_vendcode" property="pr_vendcode"/>
-      <result column="pr_docdate" property="pr_docdate"/>
-      <result column="pr_recordmanid" property="pr_recordmanid"/>
-      <result column="pr_recordman" property="pr_recordman"/>
       <result column="pr_status" property="pr_status"/>
       <result column="pr_statuscode" property="pr_statuscode"/>
       <result column="pr_text1" property="pr_text1"/>

+ 0 - 6
applications/storage/storage-server/src/main/resources/mapper/ProdInOutListMapper.xml

@@ -17,9 +17,6 @@
     <result column="pi_said" jdbcType="INTEGER" property="pi_said" />
     <result column="pi_sacode" jdbcType="VARCHAR" property="pi_sacode" />
     <result column="pi_total" jdbcType="DOUBLE" property="pi_total" />
-    <result column="pi_recordmanid" jdbcType="INTEGER" property="pi_recordmanid" />
-    <result column="pi_recordman" jdbcType="VARCHAR" property="pi_recordman" />
-    <result column="pi_recorddate" jdbcType="TIMESTAMP" property="pi_recorddate" />
     <result column="pi_status" jdbcType="VARCHAR" property="pi_status" />
     <result column="pi_statuscode" jdbcType="VARCHAR" property="pi_statuscode" />
     <result column="pi_printstatus" jdbcType="VARCHAR" property="pi_printstatus" />
@@ -95,9 +92,6 @@
     <result column="pr_vendid" property="pr_vendid"/>
     <result column="pr_vendname" property="pr_vendname"/>
     <result column="pr_vendcode" property="pr_vendcode"/>
-    <result column="pr_docdate" property="pr_docdate"/>
-    <result column="pr_recordmanid" property="pr_recordmanid"/>
-    <result column="pr_recordman" property="pr_recordman"/>
     <result column="pr_status" property="pr_status"/>
     <result column="pr_statuscode" property="pr_statuscode"/>
     <result column="pr_text1" property="pr_text1"/>

+ 1 - 29
applications/storage/storage-server/src/main/resources/mapper/ProdInOutMapper.xml

@@ -17,9 +17,6 @@
     <result column="pi_said" jdbcType="INTEGER" property="pi_said" />
     <result column="pi_sacode" jdbcType="VARCHAR" property="pi_sacode" />
     <result column="pi_total" jdbcType="DOUBLE" property="pi_total" />
-    <result column="pi_recordmanid" jdbcType="INTEGER" property="pi_recordmanid" />
-    <result column="pi_recordman" jdbcType="VARCHAR" property="pi_recordman" />
-    <result column="pi_recorddate" jdbcType="TIMESTAMP" property="createTime" />
     <result column="pi_status" jdbcType="VARCHAR" property="pi_status" />
     <result column="pi_statuscode" jdbcType="VARCHAR" property="pi_statuscode" />
     <result column="pi_printstatus" jdbcType="VARCHAR" property="pi_printstatus" />
@@ -49,8 +46,7 @@
 
   <sql id="Base_Column_List">
     pi_id, pi_inoutno, pi_class, pi_date, pi_vendid, pi_vendcode, pi_vendname, pi_custid, 
-    pi_custcode, pi_custname, pi_puid, pi_pucode, pi_said, pi_sacode, pi_total, pi_recordmanid, 
-    pi_recordman, pi_recorddate, pi_status, pi_statuscode, pi_printstatus, pi_printstatuscode, 
+    pi_custcode, pi_custname, pi_puid, pi_pucode, pi_said, pi_sacode, pi_total,pi_status, pi_statuscode, pi_printstatus, pi_printstatuscode,
     companyid, updaterid,updaterName,updatetime,creatorid,creatorName,createtime, pi_text1, pi_text2, pi_text3, pi_text4, pi_text5,pi_auditdate,
     pi_auditman,pi_remark,pi_ioid
   </sql>
@@ -119,12 +115,6 @@
       <if test="pi_total != null">
         pi_total,
       </if>
-      <if test="pi_recordmanid != null">
-        pi_recordmanid,
-      </if>
-      <if test="pi_recordman != null">
-        pi_recordman,
-      </if>
       <if test="pi_status != null">
         pi_status,
       </if>
@@ -137,7 +127,6 @@
       <if test="pi_printstatuscode != null">
         pi_printstatuscode,
       </if>
-
       <if test="companyId != null" >
         companyid,
       </if>
@@ -240,12 +229,6 @@
       <if test="pi_total != null">
         #{pi_total,jdbcType=DOUBLE},
       </if>
-      <if test="pi_recordmanid != null">
-        #{pi_recordmanid,jdbcType=INTEGER},
-      </if>
-      <if test="pi_recordman != null">
-        #{pi_recordman,jdbcType=VARCHAR},
-      </if>
       <if test="pi_status != null">
         #{pi_status,jdbcType=VARCHAR},
       </if>
@@ -258,7 +241,6 @@
       <if test="pi_printstatuscode != null">
         #{pi_printstatuscode,jdbcType=VARCHAR},
       </if>
-
       <if test="companyId != null" >
         #{companyId,jdbcType=INTEGER},
       </if>
@@ -277,7 +259,6 @@
       <if test="creatorName != null">
         #{creatorName,jdbcType=VARCHAR},
       </if>
-
       <if test="createTime != null" >
         #{createTime,jdbcType=TIMESTAMP},
       </if>
@@ -365,15 +346,6 @@
       <if test="pi_total != null">
         pi_total = #{pi_total,jdbcType=DOUBLE},
       </if>
-      <if test="pi_recordmanid != null">
-        pi_recordmanid = #{pi_recordmanid,jdbcType=INTEGER},
-      </if>
-      <if test="pi_recordman != null">
-        pi_recordman = #{pi_recordman,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        pi_recorddate = #{createTime,jdbcType=TIMESTAMP},
-      </if>
       <if test="pi_status != null">
         pi_status = #{pi_status,jdbcType=VARCHAR},
       </if>