Merge remote-tracking branch 'origin/master'

op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java

@@ -190,6 +190,7 @@ public class QcCheckTaskIncome extends BaseEntity {
     private String fileList;
     private List<BaseFile> files;
     private String remark;
+    private String remarkCode;
     private String belongTo;
     private String oldBelongTo;
     private String noOkQualityNames;
@@ -852,6 +853,14 @@ public class QcCheckTaskIncome extends BaseEntity {
         return delFlag;
     }
 
+    public String getRemarkCode() {
+        return remarkCode;
+    }
+
+    public void setRemarkCode(String remarkCode) {
+        this.remarkCode = remarkCode;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java

@@ -678,6 +678,7 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 		qcCheckTask.setUpdateTime(nowTime);
 		qcCheckTask.setCheckTime(nowTime);
 		qcCheckTask.setRemark(qcCheckTaskIncome.getRemark());
+		qcCheckTask.setRemarkCode(qcCheckTaskIncome.getRemarkCode());
 		qcCheckTask.setCheckResult(result);//检验结果Y合格 N不合格
 		qcCheckTask.setIncomeBatchNo(qcCheckTaskIncome.getIncomeBatchNo());
 		BigDecimal noOkQquality = new BigDecimal("0");
@@ -841,6 +842,7 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 		qcCheckTask.setUpdateTime(nowTime);
 		qcCheckTask.setCheckTime(nowTime);
 		qcCheckTask.setRemark(qcCheckTaskIncome.getRemark());
+		qcCheckTask.setRemarkCode(qcCheckTaskIncome.getRemarkCode());
 		qcCheckTask.setCheckResult(result);//检验结果Y合格 N不合格
 		qcCheckTask.setIncomeBatchNo(qcCheckTaskIncome.getIncomeBatchNo());
 		BigDecimal noOkQquality = new BigDecimal("0");

op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml

@@ -39,6 +39,7 @@
         <result property="sampleCode" column="sample_code"/>
         <result property="orderType" column="order_type"/>
         <result property="orderTypeDesc" column="order_type_desc"/>
+        <result property="remark" column="remark"/>
     </resultMap>
 
     <sql id="selectQcCheckTaskIncomeVo">
@@ -46,7 +47,7 @@
 		       supplier_code, supplier_name, income_time, check_loc, check_status, check_man_code,
 		       check_man_name, check_time, check_result, status, attr1, attr2, attr3, attr4, create_by,
 		       create_time, update_by, update_time, factory_code, del_flag , check_type,sample_quality, noOk_quality,
-               order_type,order_type_desc
+               order_type,order_type_desc,remark
 		from qc_check_task
 	</sql>
 
@@ -313,6 +314,7 @@
         <if test="cNoOkquality != null">cNoOkquality = #{cNoOkquality},</if>
         <if test="incomeBatchNo != null">income_batch_no = #{incomeBatchNo},</if>
         <if test="remark != null">remark = #{remark},</if>
+        <if test="remarkCode != null">remark_code = #{remarkCode},</if>
         <if test="reason != null">reason = #{reason},</if>
         <if test="bz != null">bz = #{bz},</if>
         <if test="cxzz != null">cxzz = #{cxzz},</if>
@@ -362,6 +364,7 @@
             <if test="orderType != null">order_type,</if>
             <if test="orderTypeDesc != null">order_type_desc,</if>
             <if test="remark != null">remark,</if>
+            <if test="remarkCode != null">remark_code,</if>
             <if test="reason != null">reason,</if>
             <if test="bz != null">bz,</if>
             <if test="startOA != null">start_oA,</if>
@@ -420,6 +423,7 @@
             <if test="orderType != null">#{orderType},</if>
             <if test="orderTypeDesc != null">#{orderTypeDesc},</if>
             <if test="remark != null">#{remark},</if>
+            <if test="remarkCode != null">#{remarkCode},</if>
             <if test="reason != null">#{reason},</if>
             <if test="bz != null">#{bz},</if>
             <if test="startOA != null">#{startOA},</if>
@@ -458,6 +462,7 @@
         <if test="cNoOkquality != null">cNoOkquality = #{cNoOkquality},</if>
         <if test="incomeBatchNo != null">income_batch_no = #{incomeBatchNo},</if>
         <if test="remark != null">remark = #{remark},</if>
+        <if test="remarkCode != null">remark_code = #{remarkCode},</if>
         <if test="reason != null">reason = #{reason},</if>
         <if test="bz != null">bz = #{bz},</if>
         <if test="startOA != null">start_oA = #{startOA},</if>
@@ -592,6 +597,7 @@
 			qct.income_time incomeTime,
 			qct.check_loc checkLoc,
 		    qct.remark,
+            qct.remark_code remarkCode,
             qct.cxzz,
             qct.jgy,
             qct.pgy
@@ -621,6 +627,7 @@
             qct.income_time incomeTime,
             qct.check_loc checkLoc,
             qct.remark,
+            qct.remark_code remarkCode,
             qct.czbjr,
             qct.zcf,
             qct.zcoemcm,

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

@@ -1063,6 +1063,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
             List<WmsProductPutRecords>  wmsProductPutRecords1=    wmsProductPutRecordsMapper.selectWmsProductPutRecordsList(wmsProductPutRecords);
              if(wmsProductPutRecords1.size()>0){
                  wmsProductPut1.setRemark("1");//已经入库
+                 wmsProductPut1.setNumber(wmsProductPutRecords1.get(0).getNumber());
              }else {
                  wmsProductPut1.setRemark("0");//未入库
              }
@@ -1072,6 +1073,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
         if (wmsProductPut1.getAttr3()==null){
             wmsProductPut1.setAttr3(wmsProductPut1.getPlanQuantity().toString());
         }
+        wmsProductPut1.setPallet(wmsProductPut.getPallet());
         return wmsProductPut1;
     }
 
@@ -1118,7 +1120,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
         //wms_product_put
         wmsProductPutk.setWorkOrder(wmsProductPut1.getWorkOrder());
         wmsProductPutk.setProductOrder(wmsProductPut1.getProductOrder());
-        wmsProductPutk.setFactoryCode(wmsProductPut1.getFactoryCode());
+        wmsProductPutk.setFactoryCode(wmsProductPut.getFactoryCode());
         wmsProductPutk.setWhCode(wmsProductPut1.getWhCode());//仓库编码
         wmsProductPutk.setWaCode(wmsProductPut1.getWaCode());//仓库编码
         wmsProductPutk.setProductName(wmsProductPut1.getProductName());
@@ -1132,9 +1134,9 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
            BigDecimal planQuantity=    wmsProductPut2.getPlanQuantity();
            BigDecimal putQuantity=     wmsProductPut2.getPutQuantity();
            if (planQuantity.equals(putQuantity.add(new BigDecimal(wmsProductPut1.getNumber())))){
-               wmsProductPutk.setStatus("2");
-           }else {
                wmsProductPutk.setStatus("1");
+           }else {
+               wmsProductPutk.setStatus("2");
            }
            BigDecimal putQuantityT=putQuantity.add(new BigDecimal(wmsProductPut1.getNumber()));//入库数量
            wmsProductPut2.setPutQuantity(putQuantityT);
@@ -1142,7 +1144,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
            wmsProductPut2.setUpdateBy(wmsProductPut.getCreateBy());
            wmsProductPutMapper.updateWmsProductPut(wmsProductPut2);
        }else {
-           wmsProductPutk.setStatus("1");
+           wmsProductPutk.setStatus("2");
            wmsProductPutk.setSapStatus("0");
            wmsProductPutk.setAttr3(formattedDate);//
            wmsProductPutk.setCreateBy(wmsProductPut.getCreateBy());
@@ -1157,7 +1159,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
             wmsProductPutRecords.setProductName(wmsProductPut1.getProductName());
             wmsProductPutRecords.setProductCode(wmsProductPut1.getProductCode());
             wmsProductPutRecords.setWhCode(wmsProductPut1.getWhCode());//仓库编码
-            wmsProductPutRecords.setWaCode(wmsProductPut1.getWaCode());//仓库编码
+            wmsProductPutRecords.setWaCode(wmsProductPut1.getWaCode());//库区编码
             wmsProductPutRecords.setId(IdUtils.fastSimpleUUID());
             wmsProductPutRecords.setWlCode(wmsProductPut1.getWlCode());
             wmsProductPutRecords.setSn(wmsProductPut1.getSn());
@@ -1171,6 +1173,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
             wmsFpStorageNewsSn.setStorageId(IdUtils.fastSimpleUUID());
             wmsFpStorageNewsSn.setFactoryCode(wmsProductPut.getFactoryCode());
             wmsFpStorageNewsSn.setWhCode(wmsProductPut1.getWhCode());//仓库编码
+            wmsFpStorageNewsSn.setWaCode(wmsProductPut1.getWaCode());
             wmsFpStorageNewsSn.setWlCode(wmsProductPut1.getWlCode());
             wmsFpStorageNewsSn.setOrderNo(wmsProductPutk.getId());
             wmsFpStorageNewsSn.setProductCode(wmsProductPut1.getProductCode());
@@ -1182,23 +1185,25 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
             wmsFpStorageNewsSn.setCreateBy(wmsProductPut.getCreateBy());
             wmsFpStorageNewsSn.setCreateTime(new Date());
             wmsFpStorageNewsSn.setActiveFlag("1");
+            wmsFpStorageNewsSn.setUserDefined3(wmsProductPut1.getUnitOfMeasure());
             wmsFpStorageNewsSnMapper.insertWmsFpStorageNewsSn(wmsFpStorageNewsSn);
 //			wms_fp_storage_news
             WmsFpStorageNews wmsFpStorageNews = new WmsFpStorageNews();
 
             wmsFpStorageNews.setWhCode(wmsProductPut1.getWhCode());//仓库编码
-            wmsFpStorageNews.setWlCode(wmsProductPut1.getWaCode());
+            wmsFpStorageNews.setWaCode(wmsProductPut1.getWaCode());
+            wmsFpStorageNews.setWlCode(wmsProductPut1.getWlCode());
             wmsFpStorageNews.setStorageType("成品");
             wmsFpStorageNews.setProductCode(wmsProductPut1.getProductCode());
             wmsFpStorageNews.setProductName(wmsProductPut1.getProductName());
-            wmsFpStorageNews.setFactoryCode(wmsProductPut1.getFactoryCode());
+            wmsFpStorageNews.setFactoryCode(wmsProductPut.getFactoryCode());
             wmsFpStorageNews.setActiveFlag("1");
             wmsFpStorageNews.setUserDefined1(wmsProductPut1.getUnitOfMeasure());
             List<WmsFpStorageNews> wmsFpStorageNewsList = wmsFpStorageNewsMapper.selectWmsFpStorageNewsList(wmsFpStorageNews);
             wmsFpStorageNews.setStorageId(IdUtils.fastSimpleUUID());
             wmsFpStorageNews.setAmount(new BigDecimal(wmsProductPut1.getNumber()));
             wmsFpStorageNews.setCreateBy(wmsProductPut.getCreateBy());
-            wmsFpStorageNews.setCreateTime(new Date());
+            wmsFpStorageNews.setGmtCreate(new Date());
             if (wmsFpStorageNewsList.size() > 0) {
                 WmsFpStorageNews wmsFpStorageNews1 = wmsFpStorageNewsList.get(0);
                 BigDecimal amount = wmsFpStorageNews1.getAmount();