diff --git a/src/main/java/com/huaheng/pc/config/material/controller/MaterialController.java b/src/main/java/com/huaheng/pc/config/material/controller/MaterialController.java
index 331d93e..04e1b87 100644
--- a/src/main/java/com/huaheng/pc/config/material/controller/MaterialController.java
+++ b/src/main/java/com/huaheng/pc/config/material/controller/MaterialController.java
@@ -167,5 +167,4 @@ public class MaterialController extends BaseController {
return util.importTemplateExcel("物料");
}
-
}
diff --git a/src/main/java/com/huaheng/pc/config/material/mapper/MaterialMapper.java b/src/main/java/com/huaheng/pc/config/material/mapper/MaterialMapper.java
index 26e902d..8694d5a 100644
--- a/src/main/java/com/huaheng/pc/config/material/mapper/MaterialMapper.java
+++ b/src/main/java/com/huaheng/pc/config/material/mapper/MaterialMapper.java
@@ -4,4 +4,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.huaheng.pc.config.material.domain.Material;
public interface MaterialMapper extends BaseMapper<Material> {
+
+ /**
+ * 根据编码查询物料
+ * @param code
+ * @return Material
+ */
+ Material findAllByCode(String code);
}
\ No newline at end of file
diff --git a/src/main/java/com/huaheng/pc/config/material/service/MaterialService.java b/src/main/java/com/huaheng/pc/config/material/service/MaterialService.java
index 0b689e3..d7c8b99 100644
--- a/src/main/java/com/huaheng/pc/config/material/service/MaterialService.java
+++ b/src/main/java/com/huaheng/pc/config/material/service/MaterialService.java
@@ -8,9 +8,20 @@ import java.util.List;
public interface MaterialService extends IService<Material>{
+ /**
+ * 批量删除物料
+ * @param ids
+ * @return
+ */
AjaxResult removeByIds(String ids);
-
+ /**
+ * excel导入物料
+ * @param materialList
+ * @param updateSupport
+ * @param operName
+ * @return
+ */
String importMaterial(List<Material> materialList, Boolean updateSupport,String operName);
/**
@@ -19,4 +30,6 @@ public interface MaterialService extends IService<Material>{
* @return
*/
AjaxResult addSave(Material material);
+
+ Material findAllByCode(String code);
}
diff --git a/src/main/java/com/huaheng/pc/config/material/service/MaterialServiceImpl.java b/src/main/java/com/huaheng/pc/config/material/service/MaterialServiceImpl.java
index 7befdf9..3cbcebe 100644
--- a/src/main/java/com/huaheng/pc/config/material/service/MaterialServiceImpl.java
+++ b/src/main/java/com/huaheng/pc/config/material/service/MaterialServiceImpl.java
@@ -7,6 +7,7 @@ import com.huaheng.common.support.Convert;
import com.huaheng.common.utils.StringUtils;
import com.huaheng.common.utils.security.ShiroUtils;
import com.huaheng.framework.web.domain.AjaxResult;
+import com.huaheng.pc.config.materialMultiple.domain.MaterialMultiple;
import com.huaheng.pc.config.materialType.domain.MaterialType;
import com.huaheng.pc.config.materialType.service.MaterialTypeService;
import com.huaheng.pc.config.materialUnit.domain.MaterialUnit;
@@ -32,6 +33,8 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, Material> i
private MaterialUnitService materialUnitService;
@Resource
private MaterialTypeService materialTypeService;
+ @Resource
+ private MaterialMapper materialMapper;
@Override
public AjaxResult removeByIds(String ids) {
@@ -151,6 +154,11 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, Material> i
return AjaxResult.success("新增物料成功");
}
+ @Override
+ public Material findAllByCode(String code) {
+ return materialMapper.findAllByCode(code);
+ }
+
/**
* 生成物料编码
* @param code
diff --git a/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java b/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java
index 1a4b5ad..579b1ba 100644
--- a/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java
+++ b/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java
@@ -130,16 +130,16 @@ public class InventoryDetailServiceImpl extends ServiceImpl<InventoryDetailMappe
@Override
public List<InventoryDetail> selectBysql(String sql, ShipmentDetail shipmentDetail, String sqll, ShipmentPreference shipmentPreference) {
- if(shipmentPreference.getAllowQcCheckResult() == true) {
+ if(shipmentPreference.getAllowQcCheckResult() == false) {
sql = sql + " \n" + "and warehouseCode='" + shipmentDetail.getWarehouseCode() + "' \n" +
"and companyCode='" + shipmentDetail.getCompanyCode() + "' \n" +
"and materialCode='" + shipmentDetail.getMaterialCode() + "' \n" +
- "and inventorySts='" + shipmentDetail.getInventorySts() + "'\n"+
"and inventorySts='" + shipmentDetail.getInventorySts() + "'\n"+ sqll;
}else {
sql = sql + " \n" + "and warehouseCode='" + shipmentDetail.getWarehouseCode() + "' \n" +
"and companyCode='" + shipmentDetail.getCompanyCode() + "' \n" +
"and materialCode='" + shipmentDetail.getMaterialCode() + "' \n" +
+ "and inventorySts='" + shipmentDetail.getInventorySts() + "'\n"+
"and qcCheck=1\n"+ sqll;
}
return inventoryDetailMapper.selectBysql(sql);
diff --git a/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java b/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java
index a88329a..1802005 100644
--- a/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java
+++ b/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java
@@ -375,6 +375,7 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl<ReceiptContai
* 自动生成容器编码
* @return 容器编码
*/
+ @Transactional
public String createContainer(){
String code = MessageFormat.format("{0}{1}",
"LS",
@@ -387,6 +388,7 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl<ReceiptContai
container.setCreatedBy(ShiroUtils.getLoginName());
container.setLastUpdated(new Date());
container.setLastUpdatedBy(ShiroUtils.getLoginName());
+ container.setEnable(true);
container.setStatus("empty");
if (!containerService.save(container)){
throw new ServiceException("新增容器失败");
diff --git a/src/main/java/com/huaheng/pc/receipt/receiptDetail/controller/ReceiptDetailController.java b/src/main/java/com/huaheng/pc/receipt/receiptDetail/controller/ReceiptDetailController.java
index 690f761..9dc996b 100644
--- a/src/main/java/com/huaheng/pc/receipt/receiptDetail/controller/ReceiptDetailController.java
+++ b/src/main/java/com/huaheng/pc/receipt/receiptDetail/controller/ReceiptDetailController.java
@@ -181,7 +181,9 @@ public class ReceiptDetailController extends BaseController {
ReceiptDetail newReceiptDetail = receiptDetailService.getById(id);
//更新入库明细状态
- receiptDetailService.updateById(receiptDetailService.queryflow(newReceiptDetail));
+ if (!receiptDetailService.updateById(receiptDetailService.queryflow(newReceiptDetail))){
+ throw new ServiceException("更新入库明细失败");
+ }
ReceiptHeader receiptHeader = new ReceiptHeader();
receiptHeader.setFirstStatus(approval);
receiptHeader.setId(newReceiptDetail.getReceiptId());
diff --git a/src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderService.java b/src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderService.java
index de83f05..6d0f442 100644
--- a/src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderService.java
+++ b/src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderService.java
@@ -104,13 +104,18 @@ public class ReceiptHeaderService extends ServiceImpl<ReceiptHeaderMapper, Recei
*/
public AjaxResult reservation(ReceiptHeader receiptHeader) {
LambdaQueryWrapper<ReceiptDetail> receiptDetailLambda = Wrappers.lambdaQuery();
- receiptDetailLambda.eq(ReceiptDetail::getReceiptId, receiptHeader.getId())
- .eq(ReceiptDetail::getProcessStamp, "120");
+ receiptDetailLambda.eq(ReceiptDetail::getReceiptId, receiptHeader.getId());
List<ReceiptDetail> receiptDetails = receiptDetailService.list(receiptDetailLambda);
//更新入库明细流程
for (ReceiptDetail receiptDetail : receiptDetails) {
- receiptDetail = receiptDetailService.queryflow(receiptDetail);
- receiptDetailService.updateById(receiptDetail);
+ receiptDetail.setProcessStamp("120");
+ if (!receiptDetailService.updateById(receiptDetail)){
+ throw new ServiceException("更新入库明细处理标记失败");
+ }
+ receiptDetail = receiptDetailService.queryflow(receiptDetail);
+ if (!receiptDetailService.updateById(receiptDetail)){
+ throw new ServiceException("更新入库明细流程失败");
+ }
}
receiptHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
//更新入库单预约时间
diff --git a/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java b/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
index 71b50a9..fb7843a 100644
--- a/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
+++ b/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
@@ -425,11 +425,11 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
@Transactional
public void completeTask(TaskHeader task) {
//区分任务类型
- if (task.getTaskType() == 100) {
+ if (task.getInternalTaskType() == 100) {
//入库任务
completeReceiptTask(task);
}
- if (task.getTaskType() == 200) {
+ if (task.getInternalTaskType() == 200) {
// 出库任务
completeShipmentTask(task);
}
@@ -598,6 +598,18 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
if (! receiptContainerDetailService.update(receiptContainerDetail, receiptContainerDetailLambdaUpdateWrapper))
throw new ServiceException("更新组盘状态失败");
+
+ //修改入库组盘头表状态
+
+ ReceiptContainerHeader receiptContainerHeader = new ReceiptContainerHeader();
+ receiptContainerHeader.setId(task.getAllocationHeadId());
+ receiptContainerHeader.setLastUpdated(new Date());
+ receiptContainerHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
+ receiptContainerHeader.setStatus((short) 20);
+ if (!receiptContainerHeaderService.updateById(receiptContainerHeader)){
+ throw new ServiceException("更新入库组盘头表状态失败");
+ }
+
//修改入库单状态
ReceiptHeader receiptHeader = new ReceiptHeader();
receiptHeader.setFirstStatus(800);
@@ -606,17 +618,8 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
receiptHeader.setLastUpdated(new Date());
LambdaUpdateWrapper<ReceiptHeader> receiptHeaderLambdaUpdateWrapper = Wrappers.lambdaUpdate();
receiptHeaderLambdaUpdateWrapper.eq(ReceiptHeader::getId,DataUtils.getInteger(map.get("receiptId")));
- if (! receiptHeaderService.update(receiptHeader, receiptHeaderLambdaUpdateWrapper))
- throw new ServiceException("更新入库状态失败");
-// if (task.getInternalTaskType()==100){
-// //修改入库明细
-// ReceiptDetail receiptDetail = receiptDetailService.queryflow(receiptDetailService.getById(DataUtils.getInteger(map.get("receiptDetailId"))));
-// if (!receiptDetailService.updateById(receiptDetail)){
-// throw new ServiceException("更新状态失败");
-// }
-// receiptDetailService.updateReceiptHeaderLastStatus(receiptDetail.getReceiptId());
-// }
-
+ if (!receiptHeaderService.update(receiptHeader, receiptHeaderLambdaUpdateWrapper))
+ throw new ServiceException("更新入库头表状态失败");
}
diff --git a/src/main/resources/mybatis/config/MaterialMapper.xml b/src/main/resources/mybatis/config/MaterialMapper.xml
index 2484c68..e1c0f5c 100644
--- a/src/main/resources/mybatis/config/MaterialMapper.xml
+++ b/src/main/resources/mybatis/config/MaterialMapper.xml
@@ -50,4 +50,7 @@
lastUpdatedBy, version, userDef1, userDef2, userDef3, userDef4, userDef5, userDef6,
userDef7, userDef8
</sql>
+ <select id="findAllByCode" resultMap="BaseResultMap" parameterType="java.lang.String">
+ select * from material where code = #{code,jdbcType=VARCHAR}
+ </select>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/templates/receipt/receiptContainerHeader/receiptContainerHeader.html b/src/main/resources/templates/receipt/receiptContainerHeader/receiptContainerHeader.html
index 74d6ec0..46b0642 100644
--- a/src/main/resources/templates/receipt/receiptContainerHeader/receiptContainerHeader.html
+++ b/src/main/resources/templates/receipt/receiptContainerHeader/receiptContainerHeader.html
@@ -81,7 +81,7 @@
var removeFlag = [[${@permission.hasPermi('receipt:receiptContainer:remove')}]];
var prefix = ctx + "receipt/receiptContainerHeader";
var detailPrefix = ctx + "receipt/receiptContainerDetail";
- var receiptTaskType=[[${@dict.getType('receiptTaskType')}]];
+ var taskType=[[${@dict.getType('taskType')}]];
// var taskStatus=[[${@dict.getType('taskStatus')}]]; //任务状态
var receiptContainerHeaderStatus = [[${@dict.getType('receiptContainerHeaderStatus')}]] //容器状态
var S_headerId;
@@ -118,7 +118,7 @@
title : '任务类型',
align: 'center',
formatter: function(value, row, index) {
- return $.table.selectDictLabel(receiptTaskType, value);
+ return $.table.selectDictLabel(taskType, value);
},sortable:true
},
{
diff --git a/src/main/resources/templates/receipt/receiving/add.html b/src/main/resources/templates/receipt/receiving/add.html
index 2b9cc16..bf1dd02 100644
--- a/src/main/resources/templates/receipt/receiving/add.html
+++ b/src/main/resources/templates/receipt/receiving/add.html
@@ -70,7 +70,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">定位规则：</label>
<div class="col-sm-8">
- <select id="locatingRule" name="locatingRule" class="form-control" th:with="list=${@FilterConfigDetailService.queryFilterConfigDetail('入库')}">
+ <select id="locatingRule" name="locatingRule" class="form-control" th:with="list=${@FilterConfigDetailService.queryFilterConfigDetail('locationRule')}">
<option value="">请选择</option>
<option th:each="item : ${list}" th:text="${item['description']}" th:value="${item['code']}"></option>
</select>
diff --git a/src/main/resources/templates/receipt/receiving/receiving.html b/src/main/resources/templates/receipt/receiving/receiving.html
index 01b8c3e..61e7b3e 100644
--- a/src/main/resources/templates/receipt/receiving/receiving.html
+++ b/src/main/resources/templates/receipt/receiving/receiving.html
@@ -145,7 +145,6 @@
receiptDetailId:value.data[i].receiptDetailId,
containerCode: value.data[i].containerCode,
locationCode: value.data[i].locationCode,
- taskType: value.data[i].taskType,
materialCode: value.data[i].materialCode,
materialName: value.data[i].materialName,
materialSpec: value.data[i].materialSpec,
@@ -312,14 +311,6 @@
title : '数量'
},
{
- field : 'taskType',
- title : '任务类型',
- align: 'center',
- formatter: function(value, row, index) {
- return $.table.selectDictLabel(Types, value);
- }
- },
- {
field : 'project',
title : '项目号'
},