Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop

xqs
2 parents 9a2112b0 95023bb5
Showing 13 changed files with 169 additions and 11 deletions
src/main/java/com/huaheng/pc/check/checkingRegister/controller/CheckingRegisterController.java
src/main/java/com/huaheng/pc/config/station/domain/Station.java
src/main/java/com/huaheng/pc/config/station/mapper/StationMapper.java
src/main/java/com/huaheng/pc/config/station/service/StationService.java
src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java
src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderService.java
src/main/java/com/huaheng/pc/receipt/receiving/service/ReceivingService.java
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
src/main/resources/mybatis/config/StationMapper.xml
src/main/resources/templates/check/checkHeader/checkHeader.html
src/main/resources/templates/config/material/material.html
src/main/resources/templates/receipt/receiving/add.html
src/main/resources/templates/task/taskHeader/taskHeader.html
@@ -130,10 +130,12 @@ public class CheckingRegisterController extends BaseController {
             IPage<CheckingRegister> iPage = checkingRegisterService.page(page, lambdaQueryWrapper);
             if (isDetailNull){
                 if (iPage.getTotal() == 0){
+                    //空list
                     List emptyList = checkingRegisterService.emptyList(checkingRegister.getCheckDetailId());
                     return getMpDataTable(emptyList, Long.valueOf(emptyList.size()));
                 }
                 if (!"20".equals(checkDetail.getStatus())){
+                    //未完成质检list
                     List notCompleteList = checkingRegisterService.notCompleteList(checkingRegister.getCheckDetailId());
                     return getMpDataTable(notCompleteList, Long.valueOf(notCompleteList.size()));
                 }
@@ -143,10 +145,12 @@ public class CheckingRegisterController extends BaseController {
             List<CheckingRegister> list = checkingRegisterService.list(lambdaQueryWrapper);
             if (isDetailNull){
                 if (list.size() == 0){
+                    //空list
                     List emptyList = checkingRegisterService.emptyList(checkingRegister.getCheckDetailId());
                     return getMpDataTable(emptyList, Long.valueOf(emptyList.size()));
                 }
                 if (!"20".equals(checkDetail.getStatus())){
+                    //未完成质检list
                     List notCompleteList = checkingRegisterService.notCompleteList(checkingRegister.getCheckDetailId());
                     return getMpDataTable(notCompleteList, Long.valueOf(notCompleteList.size()));
                 }
+package com.huaheng.pc.config.station.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * Created by Enzo Cotter on 2019/10/11.
+ */
+
+@ApiModel(value="com.huaheng.pc.config.station.domain.Station")
+@Data
+@TableName(value = "station")
+public class Station implements Serializable {
+    @TableId(value = "id", type = IdType.INPUT)
+    @ApiModelProperty(value="null")
+    private Integer id;
+
+    /**
+     * 编码
+     */
+    @TableField(value = "code")
+    @ApiModelProperty(value="编码")
+    private String code;
+
+    /**
+     * 状态
+     */
+    @TableField(value = "status")
+    @ApiModelProperty(value="状态")
+    private Integer status;
+
+    /**
+     * 仓库编码
+     */
+    @TableField(value = "warehouseCode")
+    @ApiModelProperty(value="仓库编码")
+    private String warehouseCode;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "created")
+    @ApiModelProperty(value="创建时间")
+    private Date created;
+
+    /**
+     * 创建者
+     */
+    @TableField(value = "createdBy")
+    @ApiModelProperty(value="创建者")
+    private String createdBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "lastUpdated")
+    @ApiModelProperty(value="更新时间")
+    private Date lastUpdated;
+
+    /**
+     * 更新者
+     */
+    @TableField(value = "lastUpdatedBy")
+    @ApiModelProperty(value="更新者")
+    private String lastUpdatedBy;
+
+    private static final long serialVersionUID = 1L;
+}
 \ No newline at end of file
+package com.huaheng.pc.config.station.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huaheng.pc.config.station.domain.Station;
+
+/**
+ * Created by Enzo Cotter on 2019/10/11.
+ */
+
+public interface StationMapper extends BaseMapper<Station> {
+}
 \ No newline at end of file
+package com.huaheng.pc.config.station.service;
+
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huaheng.pc.config.station.domain.Station;
+import com.huaheng.pc.config.station.mapper.StationMapper;
+/**
+ * Created by Enzo Cotter on 2019/10/11.
+ */
+
+@Service
+public class StationService extends ServiceImpl<StationMapper, Station> {
+
+}
@@ -289,6 +289,10 @@ public class ReceiptDetailServiceImpl extends ServiceImpl&lt;ReceiptDetailMapper, R
         lambdaDetails.eq(ReceiptDetail::getReceiptId, id);
         List<ReceiptDetail> receiptDetails = this.list(lambdaDetails);
+        // 判断入库明细是否为空
+        if (receiptDetails.isEmpty()){
+            throw new ServiceException("不存在入库明细");
+        }
         //查询出头表信息
         ReceiptHeader receiptHeader = receiptHeaderService.getById(id);
         Integer minStatus = Integer.parseInt(receiptDetails.get(0).getProcessStamp());
@@ -362,7 +366,7 @@ public class ReceiptDetailServiceImpl extends ServiceImpl&lt;ReceiptDetailMapper, R
         //如果明细中需要质检，则判断是否已经生成质检单
         if ("0".equals(receiptDetail.getQcCheck())){
             LambdaQueryWrapper<CheckHeader> lambda = Wrappers.lambdaQuery();
-            lambda.eq(CheckHeader::getReferCode, receiptDetail.getReceiptCode());
+            lambda.eq(CheckHeader::getCode, receiptDetail.getReceiptCode());
             CheckHeader checkHeader = checkHeaderService.getOne(lambda);
             if (checkHeader == null){
                 return true;
@@ -24,6 +24,7 @@ import com.huaheng.pc.receipt.receiptDetail.service.ReceiptDetailServiceImpl;
 import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
 import com.huaheng.pc.receipt.receiptHeader.mapper.ReceiptHeaderMapper;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.lang.ref.WeakReference;
@@ -161,10 +162,10 @@ public class ReceiptHeaderService extends ServiceImpl&lt;ReceiptHeaderMapper, Recei
         //判断是否已经生成了质检单
         LambdaQueryWrapper<CheckHeader> checkHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
-        checkHeaderLambdaQueryWrapper.eq(CheckHeader::getReferCode, receiptHeader.getCode());
+        checkHeaderLambdaQueryWrapper.eq(CheckHeader::getCode, receiptHeader.getCode());
         CheckHeader checkHeaderQuery = checkHeaderService.getOne(checkHeaderLambdaQueryWrapper);
         if (checkHeaderQuery != null){
-            throw new ServiceException("质检表已生成");
+            throw new ServiceException("质检单已生成");
         }
         //创建质检头表
         CheckHeader checkHeader = new CheckHeader();
@@ -260,6 +261,7 @@ public class ReceiptHeaderService extends ServiceImpl&lt;ReceiptHeaderMapper, Recei
      * @param ids 头表id字符串
      * @return
      */
+    @Transactional
     public AjaxResult addPool(String ids){
         List<Integer> idList = Arrays.asList(Convert.toIntArray(ids));
         for (Integer id : idList){
@@ -269,6 +271,12 @@ public class ReceiptHeaderService extends ServiceImpl&lt;ReceiptHeaderMapper, Recei
             if (list.size() != 0){
                 for (ReceiptDetail receiptDetail : list){
                     if (Integer.parseInt(receiptDetail.getProcessStamp()) < 100){
+                        //判断入库明细是否需要审核
+                        ReceiptDetail beforeReceiptDetail = receiptDetailService.queryflow(receiptDetail);
+                        if (Integer.parseInt(beforeReceiptDetail.getProcessStamp()) == 5 || Integer.parseInt(beforeReceiptDetail.getProcessStamp()) == 100){
+                            throw new ServiceException("请先提交审核");
+                        }
+                        //加入订单池
                         receiptDetail.setProcessStamp("100");
                         ReceiptDetail receiptDetail1 = receiptDetailService.queryflow(receiptDetail);
                         if (!receiptDetailService.updateById(receiptDetail1)){
@@ -282,6 +290,6 @@ public class ReceiptHeaderService extends ServiceImpl&lt;ReceiptHeaderMapper, Recei
             //更新头表状态
             receiptDetailService.updateReceiptHeaderLastStatus(id);
         }
-        return AjaxResult.success("");
+        return AjaxResult.success("加入成功");
     }
 }
@@ -112,7 +112,7 @@ public class ReceivingService {
                         //物料类别中定位规则为空时，查询入库首选项
                         LambdaQueryWrapper<ConfigValue> configValueLambda = Wrappers.lambdaQuery();
                         configValueLambda.eq(ConfigValue::getWarehouseCode, ShiroUtils.getWarehouseCode())
-                                .eq(ConfigValue::getModuleType, "入库")
+                                .eq(ConfigValue::getModuleType, "receipt")
                                 .eq(ConfigValue::getRecordType, "入库首选项");
                         ConfigValue configValue = configValueService.getOne(configValueLambda);
                         LambdaQueryWrapper<ReceiptPreference> lambdaQueryWrapper = Wrappers.lambdaQuery();
@@ -148,7 +148,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
                 ReceiptContainerHeader record =new ReceiptContainerHeader();
                 record.setStatus((short)0);
                 record.setId(taskHeader.getAllocationHeadId());
-                if (receiptContainerHeaderService.updateById(record)){throw new ServiceException("回滚组盘明细失败");}
+                if (!receiptContainerHeaderService.updateById(record)){throw new ServiceException("回滚组盘明细失败");}
             }
             //根据任务类型来更新货箱状态
             //修改关联的货箱状态
@@ -1174,8 +1174,6 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
                             if (!receiptDetailService.updateById(detail)){
                                 throw new ServiceException("更新入库单详情失败");
                             }
-                            //更新头表状态
-                            receiptDetailService.updateReceiptHeaderLastStatus(receiptDetail.getReceiptId());
                         }
                     }
                 } else {
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huaheng.pc.config.station.mapper.StationMapper">
+  <resultMap id="BaseResultMap" type="com.huaheng.pc.config.station.domain.Station">
+    <!--@mbg.generated-->
+    <!--@Table station-->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="code" jdbcType="VARCHAR" property="code" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
+    <result column="created" jdbcType="TIMESTAMP" property="created" />
+    <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
+    <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
+    <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, code, `status`, warehouseCode, created, createdBy, lastUpdated, lastUpdatedBy
+  </sql>
+</mapper>
 \ No newline at end of file
@@ -130,7 +130,7 @@
     var receiptTypes = [[${@receiptTypeService.getType()}]];
     var checkHeaderStatus = [[${@dict.getType('checkHeaderStatus')}]];
     var checkDetailStatus = [[${@dict.getType('checkDetailStatus')}]];
-    var inventorySts = [[${@dict.getType('inventoryStatus')}]];
+    var inventorySts = [[${@dict.getType('inventorySts')}]];
     var printFlag = [[${@permission.hasPermi('check:checkHeader:report')}]];
     var addFlag= [[${@permission.hasPermi('check:checkHeader:add')}]];
     var datas = [[${@dict.getType('sys_normal_disable')}]];
@@ -162,7 +162,17 @@
 				},
 				{
 					field : 'autoGenSerialNum',
-					title : '自动生成序列号' ,
+					title : '自动生成序列号',
+					align: 'center',
+					formatter: function(value, row, index) {
+						var actions = [];
+						if (value == 0){
+							actions.push("<span class='badge badge-primary'>自动生成</span>");
+						} else {
+							actions.push("<span class='badge badge-primary'>不自动生成</span>");
+						}
+						return actions.join('');
+					}
 				},
 				{
 					field : 'autoGenSerialNumFormat',
@@ -140,6 +140,7 @@
         $("input[name='openQty']").val(urlParms.openQty);
         $("input[name='inventorySts']").val(urlParms.inventorySts);
         $("input[name='materialUnit']").val(urlParms.materialUnit);
+        $("input[name='qty']").val(urlParms.totalQty-urlParms.openQty);
         $("input[name='qty']").focus();
@@ -146,7 +146,7 @@
                 sortOrder: "desc",
                 search: false,
                 clickToSelect:true,
-				queryParams:"InternalTaskType="+[[${InternalTaskType}]],
+				queryParams: queryParams,
                 columns: [{
 		            checkbox: true
 		        },
@@ -491,6 +491,17 @@
             $.modal.open("空托盘出库",prefix+"/emptyOut")
         }
+		function queryParams(params) {
+			return {
+				InternalTaskType: +[[${InternalTaskType}]],
+				// 传递参数查询参数
+				pageSize:       params.limit,
+				pageNum:        params.offset / params.limit + 1,
+				searchValue:    params.search,
+				orderByColumn:  params.sort,
+				isAsc:          params.order
+			};
+		};
     </script>
 </body>
 </html>
 \ No newline at end of file