更新出入库代码，转单代码

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/controller/ProdInOutController.java

@@ -122,6 +122,19 @@ public class ProdInOutController {
         return Result.success();
     }
 
+    /**
+     * 出入库单批量反审核
+     *
+     * @param baseDTOs
+     * @return
+     */
+    @PostMapping("/batchUnAudit")
+    public Result batchUnAudit(@RequestBody BatchDealBaseDTO baseDTOs) {
+        prodInOutService.batchAudit(baseDTOs);
+        return Result.success();
+    }
+
+
     /**
      * 出入库单批量删除
      *

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

@@ -73,7 +73,7 @@ public class ProdIODetail extends CommonBaseEntity implements Serializable {
 
     private Integer pd_ym;
 
-    private Double pd_yqty;
+    private Integer pd_yqty;
 
     private String pd_remark;
 

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

@@ -132,7 +132,7 @@ public class ProdInOutList extends CommonBaseEntity{
 
     private Integer pd_ym;
 
-    private Double pd_yqty;
+    private Integer pd_yqty;
 
     private String pd_remark;
 

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

@@ -16,20 +16,14 @@ import com.usoftchina.saas.purchase.dto.ProdInOutDTO;
 import com.usoftchina.saas.purchase.dto.ProdInOutFormDTO;
 import com.usoftchina.saas.purchase.dto.ProdInOutReqDTO;
 import com.usoftchina.saas.purchase.mapper.*;
-import com.usoftchina.saas.purchase.po.ProdIODetail;
-import com.usoftchina.saas.purchase.po.ProdIODetailExample;
-import com.usoftchina.saas.purchase.po.ProdInOut;
-import com.usoftchina.saas.purchase.po.ProdInOutList;
+import com.usoftchina.saas.purchase.po.*;
 import com.usoftchina.saas.purchase.service.ProdInOutService;
 import com.usoftchina.saas.utils.BeanMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * Created by zdw
@@ -285,7 +279,6 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
     public Result turnProdOut(Long id) {
         ProdInOut sourcePi = getMapper().selectByPrimaryKey(id);
 
-
         Integer count=0;
         double pdInqty=0, pdYqty=0;
 
@@ -309,14 +302,49 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         //插入验退单主表
         ProdInOut targetPi = new ProdInOut();
         //生成单号
-//        String
-        
-        
-        
-
-
-
-        return null;
+        String piInoutno = "YT0001";
+        targetPi.setPi_inoutno(piInoutno);
+        targetPi.setPi_class("采购验退单");
+        targetPi.setPi_recorddate(new Date());
+        targetPi.setPi_vendcode(sourcePi.getPi_vendcode());
+        targetPi.setPi_vendname(sourcePi.getPi_vendname());
+        targetPi.setPi_puid(sourcePi.getId().intValue());
+        targetPi.setPi_pucode(sourcePi.getPi_pucode());
+        //设置公司id
+        targetPi.setCompanyId(sourcePi.getCompanyId());
+        //保存数据
+        getMapper().insertSelective(targetPi);
+        //插入验退单从表
+        long pi_id = sourcePi.getId();
+
+         for (int i = 0;i<sourcePids.size();i++){
+             ProdIODetail sourcePid = sourcePids.get(i);
+             ProdIODetail targetPid = new ProdIODetail();
+             targetPid.setPd_piid(pi_id);
+             targetPid.setPd_inoutno(piInoutno);
+             targetPid.setPd_piclass("采购验退单");
+             targetPid.setPd_pdno(i);
+             targetPid.setPd_orderid(sourcePid.getPd_orderid());
+             targetPid.setPd_ordercode(sourcePid.getPd_ordercode());
+             targetPid.setPd_orderdetno(sourcePid.getPd_orderdetno());
+             targetPid.setPd_orderprice(sourcePid.getPd_orderprice());
+             targetPid.setPd_prodid(sourcePid.getPd_prodid());
+             targetPid.setPd_prodcode(sourcePid.getPd_prodcode());
+             //公司id
+             targetPid.setCompanyId(sourcePid.getCompanyId());
+
+             //本次转单数
+             targetPid.setPd_outqty(sourcePid.getPd_inqty()-sourcePid.getPd_yqty());
+             prodIODetailMapper.insertSelective(targetPid);
+
+             //更新已转数
+             sourcePid.setPd_yqty(sourcePid.getPd_inqty());
+
+             prodIODetailMapper.updateByPrimaryKeySelective(sourcePid);
+
+         }
+
+        return Result.success();
     }
 
 }

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

@@ -327,7 +327,7 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
             prodIODetail.setPd_prodid(purchaseDetail.getPd_prodid());
             prodIODetail.setPd_prodcode(purchaseDetail.getPd_prodcode());
             //公司id
-            prodIODetail.setCompanyId(1);
+            prodIODetail.setCompanyId(purchaseDetail.getCompanyId());
 
             //本次转单数
             prodIODetail.setPd_inqty((int) (purchaseDetail.getPd_qty()-purchaseDetail.getPd_yqty()));

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

@@ -39,7 +39,7 @@
     <result column="pd_text4" jdbcType="VARCHAR" property="pd_text4" />
     <result column="pd_text5" jdbcType="VARCHAR" property="pd_text5" />
     <result column="pd_ym" jdbcType="INTEGER" property="pd_ym" />
-    <result column="pd_yqty" jdbcType="DOUBLE" property="pd_yqty" />
+    <result column="pd_yqty" jdbcType="INTEGER" property="pd_yqty" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.usoftchina.saas.purchase.po.ProdIODetail">
     <result column="pd_remark" jdbcType="LONGVARCHAR" property="pd_remark" />
@@ -187,7 +187,7 @@
       #{pd_status,jdbcType=INTEGER}, #{companyid,jdbcType=INTEGER}, #{updaterid,jdbcType=INTEGER}, 
       #{updatetime,jdbcType=TIMESTAMP}, #{pd_text1,jdbcType=VARCHAR}, #{pd_text2,jdbcType=VARCHAR}, 
       #{pd_text3,jdbcType=VARCHAR}, #{pd_text4,jdbcType=VARCHAR}, #{pd_text5,jdbcType=VARCHAR}, 
-      #{pd_ym,jdbcType=INTEGER}, #{pd_yqty,jdbcType=DOUBLE}, #{pd_remark,jdbcType=LONGVARCHAR}
+      #{pd_ym,jdbcType=INTEGER}, #{pd_yqty,jdbcType=INTEGER}, #{pd_remark,jdbcType=LONGVARCHAR}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.usoftchina.saas.purchase.po.ProdIODetail">
@@ -423,7 +423,7 @@
         #{pd_ym,jdbcType=INTEGER},
       </if>
       <if test="pd_yqty != null">
-        #{pd_yqty,jdbcType=DOUBLE},
+        #{pd_yqty,jdbcType=INTEGER},
       </if>
       <if test="pd_remark != null">
         #{pd_remark,jdbcType=LONGVARCHAR},
@@ -551,7 +551,7 @@
         pd_ym = #{record.pd_ym,jdbcType=INTEGER},
       </if>
       <if test="record.pd_yqty != null">
-        pd_yqty = #{record.pd_yqty,jdbcType=DOUBLE},
+        pd_yqty = #{record.pd_yqty,jdbcType=INTEGER},
       </if>
       <if test="record.pd_remark != null">
         pd_remark = #{record.pd_remark,jdbcType=LONGVARCHAR},
@@ -600,7 +600,7 @@
       pd_text4 = #{record.pd_text4,jdbcType=VARCHAR},
       pd_text5 = #{record.pd_text5,jdbcType=VARCHAR},
       pd_ym = #{record.pd_ym,jdbcType=INTEGER},
-      pd_yqty = #{record.pd_yqty,jdbcType=DOUBLE},
+      pd_yqty = #{record.pd_yqty,jdbcType=INTEGER},
       pd_remark = #{record.pd_remark,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -645,7 +645,7 @@
       pd_text4 = #{record.pd_text4,jdbcType=VARCHAR},
       pd_text5 = #{record.pd_text5,jdbcType=VARCHAR},
       pd_ym = #{record.pd_ym,jdbcType=INTEGER},
-      pd_yqty = #{record.pd_yqty,jdbcType=DOUBLE}
+      pd_yqty = #{record.pd_yqty,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -762,7 +762,7 @@
         pd_ym = #{pd_ym,jdbcType=INTEGER},
       </if>
       <if test="pd_yqty != null">
-        pd_yqty = #{pd_yqty,jdbcType=DOUBLE},
+        pd_yqty = #{pd_yqty,jdbcType=INTEGER},
       </if>
       <if test="pd_remark != null">
         pd_remark = #{pd_remark,jdbcType=LONGVARCHAR},
@@ -808,7 +808,7 @@
       pd_text4 = #{pd_text4,jdbcType=VARCHAR},
       pd_text5 = #{pd_text5,jdbcType=VARCHAR},
       pd_ym = #{pd_ym,jdbcType=INTEGER},
-      pd_yqty = #{pd_yqty,jdbcType=DOUBLE},
+      pd_yqty = #{pd_yqty,jdbcType=INTEGER},
       pd_remark = #{pd_remark,jdbcType=LONGVARCHAR}
     where pd_id = #{pd_id,jdbcType=INTEGER}
   </update>
@@ -850,7 +850,7 @@
       pd_text4 = #{pd_text4,jdbcType=VARCHAR},
       pd_text5 = #{pd_text5,jdbcType=VARCHAR},
       pd_ym = #{pd_ym,jdbcType=INTEGER},
-      pd_yqty = #{pd_yqty,jdbcType=DOUBLE}
+      pd_yqty = #{pd_yqty,jdbcType=INTEGER}
     where pd_id = #{pd_id,jdbcType=INTEGER}
   </update>
 

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

@@ -60,7 +60,7 @@
     <result column="pd_text4" jdbcType="VARCHAR" property="pd_text4" />
     <result column="pd_text5" jdbcType="VARCHAR" property="pd_text5" />
     <result column="pd_ym" jdbcType="INTEGER" property="pd_ym" />
-    <result column="pd_yqty" jdbcType="DOUBLE" property="pd_yqty" />
+    <result column="pd_yqty" jdbcType="INTEGER" property="pd_yqty" />
   </resultMap>