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 579b1ba..2e97165 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
@@ -131,16 +131,10 @@ public class InventoryDetailServiceImpl extends ServiceImpl<InventoryDetailMappe
@Override
public List<InventoryDetail> selectBysql(String sql, ShipmentDetail shipmentDetail, String sqll, ShipmentPreference shipmentPreference) {
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"+ sqll;
+ sql = sql +"'" + shipmentDetail.getId() + "' \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;
+ sql = sql +"'" + shipmentDetail.getId() + "' \n"+
+ "and i.qcCheck=1\n"+ sqll;
}
return inventoryDetailMapper.selectBysql(sql);
}
diff --git a/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java b/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java
index 0c9c77f..817579f 100644
--- a/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java
+++ b/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java
@@ -9,6 +9,8 @@ import com.huaheng.common.utils.security.ShiroUtils;
import com.huaheng.framework.web.domain.AjaxResult;
import com.huaheng.pc.check.checkHeader.domain.CheckHeader;
import com.huaheng.pc.check.checkHeader.service.CheckHeaderService;
+import com.huaheng.pc.config.configValue.domain.ConfigValue;
+import com.huaheng.pc.config.configValue.service.ConfigValueService;
import com.huaheng.pc.config.material.domain.Material;
import com.huaheng.pc.config.material.service.MaterialService;
import com.huaheng.pc.config.materialType.domain.MaterialType;
@@ -21,6 +23,7 @@ import com.huaheng.pc.config.statusFlow.domain.StatusFlowDetail;
import com.huaheng.pc.config.statusFlow.service.StatusFlowDetailService;
import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
import com.huaheng.pc.receipt.receiptHeader.service.ReceiptHeaderService;
+import com.huaheng.pc.system.config.domain.Config;
import com.huaheng.pc.system.dict.domain.DictData;
import com.huaheng.pc.system.dict.service.IDictDataService;
import org.aspectj.weaver.loadtime.Aj;
@@ -52,6 +55,8 @@ public class ReceiptDetailServiceImpl extends ServiceImpl<ReceiptDetailMapper, R
private IDictDataService dictDataService;
@Resource
private CheckHeaderService checkHeaderService;
+ @Resource
+ private ConfigValueService configValueService;
/**
* 新增入库明细
@@ -233,9 +238,14 @@ public class ReceiptDetailServiceImpl extends ServiceImpl<ReceiptDetailMapper, R
}
return receiptDetail;
} else {
+ //查询系统参数配置中绑定的入库首选项A
+ LambdaQueryWrapper<ConfigValue> lambdaQueryWrapper = Wrappers.lambdaQuery();
+ lambdaQueryWrapper.eq(ConfigValue::getModuleType, "receipt");
+ ConfigValue configValue = configValueService.getOne(lambdaQueryWrapper);
+
//以上都没有的情况下查询入库首选项中的入库流程
LambdaQueryWrapper<ReceiptPreference> lambda = Wrappers.lambdaQuery();
- lambda.last("Limit 1");
+ lambda.eq(ReceiptPreference::getCode, configValue.getValue());
ReceiptPreference receiptPreference = receiptPreferenceService.getOne(lambda);
List<StatusFlowDetail> statusFlowDetails = statusFlowDetailService.queryStatusFlowDetail(receiptPreference.getReceivingFlow());
String status = nextStatusFlow(statusFlowDetails, receiptDetail.getProcessStamp());
diff --git a/src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java b/src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java
index aa58591..f24608c 100644
--- a/src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java
+++ b/src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java
@@ -161,7 +161,7 @@ public class ReceiptHeaderController extends BaseController {
* 审核入库单
*/
@ApiOperation(value="审核入库单", notes="审核入库单", httpMethod = "POST")
- @RequiresPermissions("receipt:receiptHeader:approval")
+ @RequiresPermissions("receipt:receiptHeader:review")
@Log(title = "入库-入库单 ",operating = "审核入库单 ", action = BusinessType.UPDATE)
@PostMapping("/approval")
@ResponseBody
@@ -303,4 +303,19 @@ public class ReceiptHeaderController extends BaseController {
}
return AjaxResult.success(receiptHeaderService.arrivalNotice(id));
}
+
+ /**
+ * 加入订单池
+ */
+ @ApiOperation(value="加入订单池 ", notes="加入订单池 ", httpMethod = "POST")
+ @RequiresPermissions("receipt:receiptHeader:addPool")
+ @Log(title = "入库-入库单 ",operating = "加入订单池 ", action = BusinessType.OTHER)
+ @PostMapping("/addPool")
+ @ResponseBody
+ public AjaxResult addPool(String ids) {
+ if (StringUtils.isEmpty(ids)){
+ return AjaxResult.error("id不能为空");
+ }
+ return AjaxResult.success(receiptHeaderService.addPool(ids));
+ }
}
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 063695b..c932d14 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
@@ -28,6 +28,7 @@ import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.lang.ref.WeakReference;
import java.text.SimpleDateFormat;
+import java.util.Arrays;
import java.util.Date;
import java.util.List;
@@ -253,4 +254,34 @@ public class ReceiptHeaderService extends ServiceImpl<ReceiptHeaderMapper, Recei
}
return AjaxResult.success("");
}
+
+ /**
+ * 加入订单池
+ * @param ids 头表id字符串
+ * @return
+ */
+ public AjaxResult addPool(String ids){
+ List<Integer> idList = Arrays.asList(Convert.toIntArray(ids));
+ for (Integer id : idList){
+ LambdaQueryWrapper<ReceiptDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
+ lambdaQueryWrapper.eq(ReceiptDetail::getReceiptId, id);
+ List<ReceiptDetail> list = receiptDetailService.list(lambdaQueryWrapper);
+ if (list.size() != 0){
+ for (ReceiptDetail receiptDetail : list){
+ if (Integer.parseInt(receiptDetail.getProcessStamp()) < 100){
+ receiptDetail.setProcessStamp("100");
+ ReceiptDetail receiptDetail1 = receiptDetailService.queryflow(receiptDetail);
+ if (!receiptDetailService.updateById(receiptDetail1)){
+ throw new ServiceException("更新入库明细状态失败");
+ }
+ } else {
+ throw new ServiceException("已有入库明细进入订单池");
+ }
+ }
+ }
+ //更新头表状态
+ receiptDetailService.updateReceiptHeaderLastStatus(id);
+ }
+ return AjaxResult.success("");
+ }
}
diff --git a/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java b/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java
index e414571..488c5b5 100644
--- a/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java
+++ b/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java
@@ -481,6 +481,11 @@ public class ShipmentContainerHeaderServiceImpl extends ServiceImpl<ShipmentCont
if (shipmentDetailList.size() < 1 || shipmentDetailList == null) {
return AjaxResult.error("找不到子单链");
}
+ for(ShipmentDetail shipmentDetail: shipmentDetailList){
+ if(shipmentDetail.getWaveId() != 0){
+ return AjaxResult.error(shipmentCode+"单号已加入波次"+shipmentDetail.getWaveId()+",无法自动组盘");
+ }
+ }
return this.autoCombination(shipmentDetailList);
}
diff --git a/src/main/java/com/huaheng/pc/shipment/shipmentDetail/controller/ShipmentDetailController.java b/src/main/java/com/huaheng/pc/shipment/shipmentDetail/controller/ShipmentDetailController.java
index 28959b5..41ca620 100644
--- a/src/main/java/com/huaheng/pc/shipment/shipmentDetail/controller/ShipmentDetailController.java
+++ b/src/main/java/com/huaheng/pc/shipment/shipmentDetail/controller/ShipmentDetailController.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huaheng.common.support.Convert;
import com.huaheng.common.utils.StringUtils;
import com.huaheng.common.utils.security.ShiroUtils;
import com.huaheng.framework.aspectj.lang.annotation.Log;
@@ -144,6 +145,9 @@ public class ShipmentDetailController extends BaseController
@ResponseBody
public AjaxResult editSave(ShipmentDetail shipmentDetail)
{
+ if(shipmentDetail.getStatus()>100 ){
+ return AjaxResult.error("超过订单池，出库明细不能修改");
+ }
if(shipmentDetailService.saveOrUpdate(shipmentDetail)==false){
return AjaxResult.error("出库明细修改失败");
}else {
@@ -160,6 +164,18 @@ public class ShipmentDetailController extends BaseController
@ResponseBody
public AjaxResult remove(String ids)
{
+ if (StringUtils.isEmpty(ids))
+ return AjaxResult.error("id不能为空");
+ for (Integer id : Convert.toIntArray(ids))
+ {
+ ShipmentDetail shipmentDetail=shipmentDetailService.getById(id);
+ if(shipmentDetail == null){
+ return AjaxResult.error("id为"+id+"的单据明细找不到");
+ }
+ if(shipmentDetail.getStatus()>100 && shipmentDetail.getStatus()<500){
+ return AjaxResult.error("此单据状态在订单池和拣货完成之间，无法删除");
+ }
+ }
AjaxResult result = shipmentDetailService.deleteDetail(ids);
return result;
}
diff --git a/src/main/java/com/huaheng/pc/shipment/shipmentDetail/service/ShipmentDetailServiceImpl.java b/src/main/java/com/huaheng/pc/shipment/shipmentDetail/service/ShipmentDetailServiceImpl.java
index fbd3a31..3c08b85 100644
--- a/src/main/java/com/huaheng/pc/shipment/shipmentDetail/service/ShipmentDetailServiceImpl.java
+++ b/src/main/java/com/huaheng/pc/shipment/shipmentDetail/service/ShipmentDetailServiceImpl.java
@@ -133,7 +133,7 @@ public class ShipmentDetailServiceImpl extends ServiceImpl<ShipmentDetailMapper,
if (list.size() > 1) {
return AjaxResult.error("有多个主单据，不能一起删除！");
}
- if (list.get(0).get("firstStatus") > 100) {
+ if (list.get(0).get("status") > 100) {
return AjaxResult.error("单据状进入订单池，不允许删除明细");
}
Integer result = shipmentDetailMapper.batchDelete(ids);
diff --git a/src/main/java/com/huaheng/pc/shipment/shipmentHeader/controller/ShipmentHeaderController.java b/src/main/java/com/huaheng/pc/shipment/shipmentHeader/controller/ShipmentHeaderController.java
index d79317a..8a5be9b 100644
--- a/src/main/java/com/huaheng/pc/shipment/shipmentHeader/controller/ShipmentHeaderController.java
+++ b/src/main/java/com/huaheng/pc/shipment/shipmentHeader/controller/ShipmentHeaderController.java
@@ -168,6 +168,12 @@ public class ShipmentHeaderController extends BaseController
for (Integer id : Convert.toIntArray(ids))
{
ShipmentHeader shipmentHeader=shipmentHeaderService.getById(id);
+ if(shipmentHeader == null){
+ return AjaxResult.error("id为"+id+"的主单单据找不到");
+ }
+ if(shipmentHeader.getFirstStatus()>100 && shipmentHeader.getFirstStatus()<500){
+ return AjaxResult.error("此单据状态在订单池和拣货完成之间，无法删除");
+ }
//出库单设定为历史出库单，并删除出库单
shipmentHeaderService.addHistory(shipmentHeader);
diff --git a/src/main/java/com/huaheng/pc/system/user/controller/IndexController.java b/src/main/java/com/huaheng/pc/system/user/controller/IndexController.java
index c7010c9..75ba6e0 100644
--- a/src/main/java/com/huaheng/pc/system/user/controller/IndexController.java
+++ b/src/main/java/com/huaheng/pc/system/user/controller/IndexController.java
@@ -167,7 +167,7 @@ public class IndexController extends BaseController
" union all\n" +
" SELECT date_sub(curdate(), interval 6 day) as click_date\n" +
") a left join (\n" +
- "SELECT DATE(h.created) AS created , SUM(d.qty) AS taskQty from receipt_container_detail d join receipt_container_header h on d.receiptContainerId = h.id and h.warehouseCode='"+ShiroUtils.getWarehouseCode()+"' WHERE h.created >= DATE_SUB(CURDATE(), INTERVAL 7 DAY) AND h.processStamp=20 GROUP BY DATE(h.created)\n" +
+ "SELECT DATE(h.created) AS created , SUM(d.qty) AS taskQty from receipt_container_detail d join receipt_container_header h on d.receiptContainerId = h.id and h.warehouseCode='"+ShiroUtils.getWarehouseCode()+"' WHERE h.created >= DATE_SUB(CURDATE(), INTERVAL 7 DAY) AND d.status=30 GROUP BY DATE(h.created)\n" +
") b on a.click_date = b.created ORDER BY a.click_date;";
List<LinkedHashMap<String, Object>> list2 = mapper.selectCommon(sql);
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 76e5524..8d3b6e6 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
@@ -1287,9 +1287,21 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
}
locationService.updateById(locationRecord);
//如果是整出，删掉这个库位上的这个托盘，否则更改托盘状态
- Container containerRecord = new Container();
+ LambdaQueryWrapper<Container> containerLam = Wrappers.lambdaQuery();
+ containerLam.eq(Container::getCode,task.getContainerCode());
+ Container ctn = containerService.getOne(containerLam);
+ if(ctn == null){
+ throw new ServiceException("系统无此容器");
+ }
if(task.getTaskType()==300) {
- containerService.updateLocationCodeAndStatus(task.getContainerCode(),"","empty");
+ if(ctn.getContainerType().equals("LS")){
+ Boolean flag = containerService.removeById(ctn.getId());
+ if(flag == false){
+ throw new ServiceException("删除临时容器失败");
+ }
+ }else {
+ containerService.updateLocationCodeAndStatus(task.getContainerCode(), "", "empty");
+ }
}
else{
//查询是否存在关联的库存，入如果没有就修改容器状态为empty
diff --git a/src/main/resources/templates/config/configValue/edit.html b/src/main/resources/templates/config/configValue/edit.html
index 8a70d85..cb8d6de 100644
--- a/src/main/resources/templates/config/configValue/edit.html
+++ b/src/main/resources/templates/config/configValue/edit.html
@@ -64,7 +64,7 @@
</div>
<div th:include="include::footer"></div>
<script type="text/javascript">
- var prefix = ctx + "config/configvalue";
+ var prefix = ctx + "config/configValue";
$("#form-configValue-edit").validate({
rules:{
moduleType:{
diff --git a/src/main/resources/templates/config/receiptPreference/add.html b/src/main/resources/templates/config/receiptPreference/add.html
index a021415..307dc6d 100644
--- a/src/main/resources/templates/config/receiptPreference/add.html
+++ b/src/main/resources/templates/config/receiptPreference/add.html
@@ -20,7 +20,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">入库流程：</label>
<div class="col-sm-8">
- <select id="receiptFlow" name="receiptFlow" class="form-control" th:with="statusFlowList=${@StatusFlow.flowList('入库单')}">
+ <select id="receiptFlow" name="receiptFlow" class="form-control" th:with="statusFlowList=${@StatusFlow.flowList('receivingFlow')}">
<option th:each="flow : ${statusFlowList}" th:text="${flow['name']}" th:value="${flow['code']}"></option>
</select>
</div>
diff --git a/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html b/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html
index 4bb7e80..e583e89 100644
--- a/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html
+++ b/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html
@@ -82,12 +82,15 @@
<a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="receipt:receiptHeader:add">
<i class="fa fa-plus"></i> 新增
</a>
- <a class="btn btn-outline btn-default btn-rounded" onclick="submitReview()" shiro:hasPermission="receipt:receiptHeader:add">
+ <a class="btn btn-outline btn-default btn-rounded" onclick="submitReview()" shiro:hasPermission="receipt:receiptHeader:approval">
<i class="fa fa-fighter-jet"></i> 提交审核
</a>
- <a class="btn btn-outline btn-primary btn-rounded" onclick="approval()" shiro:hasPermission="receipt:receiptHeader:add">
+ <a class="btn btn-outline btn-primary btn-rounded" onclick="approval()" shiro:hasPermission="receipt:receiptHeader:review">
<i class="fa fa-level-up"></i> 审核通过
</a>
+ <a class="btn btn-outline btn-primary btn-rounded" onclick="addPool()" shiro:hasPermission="receipt:receiptHeader:addPool">
+ <i class="fa fa-check-circle"></i> 加入订单池
+ </a>
<a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="receipt:receiptHeader:remove">
<i class="fa fa-trash-o"></i> 删除
</a>
@@ -828,6 +831,21 @@
var data = { "id": id };
$.operate.submit(url, "post", "json", data);
}
+
+ function addPool() {
+ var rows=$("#bootstrap-table").bootstrapTable('getSelections');
+ if (rows.length == 0) {
+ $.modal.alertWarning("请至少选择一条记录");
+ return;
+ }
+ var url = prefix+"/addPool";
+ var ids = "";
+ for(var i=0; i<rows.length; i++) {
+ ids = ids + rows[i].id + ","
+ }
+ var data = { "ids": ids.substring(0, ids.length-1),"approval": 100 };
+ $.operate.submit(url, "post", "json", data);
+ }
</script>
</body>
</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/shipment/shipmentDetail/add.html b/src/main/resources/templates/shipment/shipmentDetail/add.html
index 56b9112..92abad4 100644
--- a/src/main/resources/templates/shipment/shipmentDetail/add.html
+++ b/src/main/resources/templates/shipment/shipmentDetail/add.html
@@ -19,12 +19,6 @@
<input id="shipmentCode" name="shipmentCode" class="form-control" type="text" th:value="${shipmentCode}" readonly="readonly">
</div>
</div>
- <div class="form-group">
- <label class="col-sm-3 control-label">上游系统行号：</label>
- <div class="col-sm-8">
- <input id="referLineNum" name="referLineNum" class="form-control" type="text" onkeyup=" this.value=this.value.replace(/^\s+|\s+$/g,'')">
- </div>
- </div>
<div class="form-group">
<label class="col-sm-3 control-label">存货编码：</label>
<div class="col-sm-8">
@@ -32,6 +26,44 @@
</div>
</div>
<div class="form-group">
+ <label class="col-sm-3 control-label">库存状态：</label>
+ <div class="col-sm-8">
+ <select id="inventoryStatus" class="form-control" th:with="inventoryStatus=${@dict.getType('inventorySts')}">
+ <option th:each="dict : ${inventoryStatus}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option>
+ </select>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">发货数量：</label>
+ <div class="col-sm-8">
+ <input id="shipQty" name="shipQty" class="form-control" type="text" onkeyup=" this.value=this.value.replace(/^\s+|\s+$/g,'')">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">批次：</label>
+ <div class="col-sm-8">
+ <input id="batch" name="batch" class="form-control" type="text">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">批号：</label>
+ <div class="col-sm-8">
+ <input id="lot" name="lot" class="form-control" type="text">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">项目号：</label>
+ <div class="col-sm-8">
+ <input id="projectNo" name="project" class="form-control" type="text">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">上游系统行号：</label>
+ <div class="col-sm-8">
+ <input id="referLineNum" name="referLineNum" class="form-control" type="text" onkeyup=" this.value=this.value.replace(/^\s+|\s+$/g,'')">
+ </div>
+ </div>
+ <div class="form-group">
<label class="col-sm-3 control-label">分配规则：</label>
<div class="col-sm-8">
<select id="allocationRule" class="form-control" th:with="allocationRule=${@FilterConfigDetailService.queryFilterConfigDetail('出库')}">
@@ -59,23 +91,6 @@
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">批次：</label>
- <div class="col-sm-8">
- <input id="batch" name="batch" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">批号：</label>
- <div class="col-sm-8">
- <input id="lot" name="lot" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">项目号：</label>
- <div class="col-sm-8">
- <input id="projectNo" name="project" class="form-control" type="text">
- </div>
- </div>
<div class="form-group">
<label class="col-sm-3 control-label">生产日期：</label>
<div class="col-sm-8">
@@ -88,20 +103,6 @@
<input id="expirationDate" name="expirationDate" class="form-control" type="text">
</div>
</div>
- <div class="form-group">
- <label class="col-sm-3 control-label">库存状态：</label>
- <div class="col-sm-8">
- <select id="inventoryStatus" class="form-control" th:with="inventoryStatus=${@dict.getType('inventoryStatus')}">
- <option th:each="dict : ${inventoryStatus}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option>
- </select>
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">发货数量：</label>
- <div class="col-sm-8">
- <input id="shipQty" name="shipQty" class="form-control" type="text" onkeyup=" this.value=this.value.replace(/^\s+|\s+$/g,'')">
- </div>
- </div>
<div class="form-group">
<div class="form-control-static col-sm-offset-9">
<button type="submit" class="btn btn-primary">提交</button>
diff --git a/src/main/resources/templates/shipment/shipmentHeader/add.html b/src/main/resources/templates/shipment/shipmentHeader/add.html
index 8fbc41d..86b711a 100644
--- a/src/main/resources/templates/shipment/shipmentHeader/add.html
+++ b/src/main/resources/templates/shipment/shipmentHeader/add.html
@@ -48,18 +48,6 @@
<input id="priority" name="priority" class="form-control" type="text">
</div>
</div>
- <div class="form-group">
- <label class="col-sm-3 control-label">总数量：</label>
- <div class="col-sm-8">
- <input id="totalQty" name="totalQty" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">总行数：</label>
- <div class="col-sm-8">
- <input id="totalLines" name="totalLines" class="form-control" type="text">
- </div>
- </div>
<div class="form-group">
<label class="col-sm-3 control-label">要求到货时间：</label>
<div class="col-sm-8">
@@ -119,14 +107,7 @@
// required:true,
// digits:true,
// },
- totalQty:{
- required:false,
- digits:true,
- },
- totalLines:{
- required:false,
- digits:true,
- },
+
},
submitHandler: function(form) {
$.ajax({
@@ -140,8 +121,6 @@
"referPlatform": $("input[name='referPlatform']").val(),
"customerCode": $("input[name='customerCode']").val(),
"priority": $("input[name='priority']").val(),
- "totalQty": $("input[name='totalQty']").val(),
- "totalLines": $("input[name='totalLines']").val(),
"requestedDeliveryDate": $("input[name='requestedDeliveryDate']").val(),
},
async: false,
@@ -158,7 +137,7 @@
$(function () {
layui.use('laydate', function() {
var laydate = layui.laydate;
- laydate.render({ elem: '#appointmentTime',min: 0, theme: 'molv' ,type: 'datetime'});
+ laydate.render({ elem: '#requestedDeliveryDate', theme: 'molv', format: 'yyyy-MM-dd HH:mm:ss' });
});
})
</script>
diff --git a/src/main/resources/templates/shipment/shipmentHeader/shipmentHeader.html b/src/main/resources/templates/shipment/shipmentHeader/shipmentHeader.html
index d440942..a93bde4 100644
--- a/src/main/resources/templates/shipment/shipmentHeader/shipmentHeader.html
+++ b/src/main/resources/templates/shipment/shipmentHeader/shipmentHeader.html
@@ -175,9 +175,6 @@
<a class="btn btn-outline btn-danger btn-rounded" onclick="batRemove()" shiro:hasPermission="shipment:bill:remove">
<i class="fa fa-trash-o"></i> 删除
</a>
- <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.edit(shipmentId)" shiro:hasPermission="shipment:bill:edit">
- <i class="fa fa-edit"></i> 编辑主单据
- </a>
<a class="btn btn-outline btn-default btn-rounded" onclick="loadDetail()">
<i class="fa fa-refresh"></i> 刷新
</a>
@@ -338,9 +335,6 @@
if (row.firstStatus < 100){
actions.push('<a class="btn btn-info btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
}
- if (row.firstStatus < 120){
- actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a>');
- }
return actions.join('');
}
}]
@@ -475,7 +469,6 @@
formatter: function (value, row, index) {
var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
- actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a>');
return actions.join('');
}
}]
diff --git a/src/main/resources/templates/shipment/shipmentHeaderHistory/add.html b/src/main/resources/templates/shipment/shipmentHeaderHistory/add.html
deleted file mode 100644
index c8ee289..0000000
--- a/src/main/resources/templates/shipment/shipmentHeaderHistory/add.html
+++ /dev/null
@@ -1,205 +0,0 @@
-<!DOCTYPE HTML>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org">
-<meta charset="utf-8">
-<head th:include="include :: header"></head>
-<body class="white-bg">
- <div class="wrapper wrapper-content animated fadeInRight ibox-content">
- <form class="form-horizontal m" id="form-shipmentHeaderHistory-add">
- <div class="form-group">
- <label class="col-sm-3 control-label">出库单编码：</label>
- <div class="col-sm-8">
- <input id="code" name="code" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">仓库id：</label>
- <div class="col-sm-8">
- <input id="warehouseId" name="warehouseId" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">仓库编码：</label>
- <div class="col-sm-8">
- <input id="warehouseCode" name="warehouseCode" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">货主id：</label>
- <div class="col-sm-8">
- <input id="companyId" name="companyId" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">货主编码：</label>
- <div class="col-sm-8">
- <input id="companyCode" name="companyCode" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">上游系统单号：</label>
- <div class="col-sm-8">
- <input id="sourceCode" name="sourceCode" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">上游平台：</label>
- <div class="col-sm-8">
- <input id="sourcePlatform" name="sourcePlatform" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">出库单类型：</label>
- <div class="col-sm-8">
- <input id="type" name="type" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">客户编码：</label>
- <div class="col-sm-8">
- <input id="shipTo" name="shipTo" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">优先级：</label>
- <div class="col-sm-8">
- <input id="priority" name="priority" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">发货站台：</label>
- <div class="col-sm-8">
- <input id="station" name="station" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">总数量：</label>
- <div class="col-sm-8">
- <input id="totalQty" name="totalQty" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">总行数：</label>
- <div class="col-sm-8">
- <input id="totalLines" name="totalLines" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">备注：</label>
- <div class="col-sm-8">
- <input id="remark" name="remark" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">上传备注：</label>
- <div class="col-sm-8">
- <input id="uploadremark" name="uploadremark" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">上传时间：</label>
- <div class="col-sm-8">
- <input id="uploadTime" name="uploadTime" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">发货预约时间：</label>
- <div class="col-sm-8">
- <input id="appointmentTime" name="appointmentTime" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">单据头状态：</label>
- <div class="col-sm-8">
- <input id="firstStatus" name="firstStatus" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">单据尾状态：</label>
- <div class="col-sm-8">
- <input id="lastStatus" name="lastStatus" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">上传状态：</label>
- <div class="col-sm-8">
- <input id="uploadStatus" name="uploadStatus" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">创建时间：</label>
- <div class="col-sm-8">
- <input id="created" name="created" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">创建用户：</label>
- <div class="col-sm-8">
- <input id="createdBy" name="createdBy" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">最后修改时间：</label>
- <div class="col-sm-8">
- <input id="lastUpdated" name="lastUpdated" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">更新用户：</label>
- <div class="col-sm-8">
- <input id="lastUpdatedBy" name="lastUpdatedBy" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">是否有效：</label>
- <div class="col-sm-8">
- <input id="enable" name="enable" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">是否删除：</label>
- <div class="col-sm-8">
- <input id="deleted" name="deleted" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">自定义字段1：</label>
- <div class="col-sm-8">
- <input id="userDef1" name="userDef1" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">自定义字段2：</label>
- <div class="col-sm-8">
- <input id="userDef2" name="userDef2" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">自定义字段3：</label>
- <div class="col-sm-8">
- <input id="userDef3" name="userDef3" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <div class="form-control-static col-sm-offset-9">
- <button type="submit" class="btn btn-primary">提交</button>
- <button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button>
- </div>
- </div>
- </form>
- </div>
- <div th:include="include::footer"></div>
- <script type="text/javascript">
- var prefix = ctx + "shipment/shipmentHeaderHistory"
- $("#form-shipmentHeaderHistory-add").validate({
- rules:{
- xxxx:{
- required:true,
- },
- },
- submitHandler: function(form) {
- $.operate.save(prefix + "/add", $('#form-shipmentHeaderHistory-add').serialize());
- }
- });
- </script>
-</body>
-</html>
diff --git a/src/main/resources/templates/shipment/shipmentHeaderHistory/edit.html b/src/main/resources/templates/shipment/shipmentHeaderHistory/edit.html
deleted file mode 100644
index 06bbba6..0000000
--- a/src/main/resources/templates/shipment/shipmentHeaderHistory/edit.html
+++ /dev/null
@@ -1,206 +0,0 @@
-<!DOCTYPE HTML>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org">
-<meta charset="utf-8">
-<head th:include="include :: header"></head>
-<body class="white-bg">
- <div class="wrapper wrapper-content animated fadeInRight ibox-content">
- <form class="form-horizontal m" id="form-shipmentHeaderHistory-edit" th:object="${shipmentHeaderHistory}">
- <input id="id" name="id" th:field="*{id}" type="hidden">
- <div class="form-group">
- <label class="col-sm-3 control-label">出库单编码：</label>
- <div class="col-sm-8">
- <input id="code" name="code" th:field="*{code}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">仓库id：</label>
- <div class="col-sm-8">
- <input id="warehouseId" name="warehouseId" th:field="*{warehouseId}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">仓库编码：</label>
- <div class="col-sm-8">
- <input id="warehouseCode" name="warehouseCode" th:field="*{warehouseCode}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">货主id：</label>
- <div class="col-sm-8">
- <input id="companyId" name="companyId" th:field="*{companyId}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">货主编码：</label>
- <div class="col-sm-8">
- <input id="companyCode" name="companyCode" th:field="*{companyCode}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">上游系统单号：</label>
- <div class="col-sm-8">
- <input id="sourceCode" name="sourceCode" th:field="*{sourceCode}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">上游平台：</label>
- <div class="col-sm-8">
- <input id="sourcePlatform" name="sourcePlatform" th:field="*{sourcePlatform}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">出库单类型：</label>
- <div class="col-sm-8">
- <input id="type" name="type" th:field="*{type}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">客户编码：</label>
- <div class="col-sm-8">
- <input id="shipTo" name="shipTo" th:field="*{shipTo}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">优先级：</label>
- <div class="col-sm-8">
- <input id="priority" name="priority" th:field="*{priority}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">发货站台：</label>
- <div class="col-sm-8">
- <input id="station" name="station" th:field="*{station}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">总数量：</label>
- <div class="col-sm-8">
- <input id="totalQty" name="totalQty" th:field="*{totalQty}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">总行数：</label>
- <div class="col-sm-8">
- <input id="totalLines" name="totalLines" th:field="*{totalLines}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">备注：</label>
- <div class="col-sm-8">
- <input id="remark" name="remark" th:field="*{remark}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">上传备注：</label>
- <div class="col-sm-8">
- <input id="uploadremark" name="uploadremark" th:field="*{uploadremark}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">上传时间：</label>
- <div class="col-sm-8">
- <input id="uploadTime" name="uploadTime" th:field="*{uploadTime}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">发货预约时间：</label>
- <div class="col-sm-8">
- <input id="appointmentTime" name="appointmentTime" th:field="*{appointmentTime}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">单据头状态：</label>
- <div class="col-sm-8">
- <input id="firstStatus" name="firstStatus" th:field="*{firstStatus}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">单据尾状态：</label>
- <div class="col-sm-8">
- <input id="lastStatus" name="lastStatus" th:field="*{lastStatus}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">上传状态：</label>
- <div class="col-sm-8">
- <input id="uploadStatus" name="uploadStatus" th:field="*{uploadStatus}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">创建时间：</label>
- <div class="col-sm-8">
- <input id="created" name="created" th:field="*{created}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">创建用户：</label>
- <div class="col-sm-8">
- <input id="createdBy" name="createdBy" th:field="*{createdBy}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">最后修改时间：</label>
- <div class="col-sm-8">
- <input id="lastUpdated" name="lastUpdated" th:field="*{lastUpdated}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">更新用户：</label>
- <div class="col-sm-8">
- <input id="lastUpdatedBy" name="lastUpdatedBy" th:field="*{lastUpdatedBy}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">是否有效：</label>
- <div class="col-sm-8">
- <input id="enable" name="enable" th:field="*{enable}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">是否删除：</label>
- <div class="col-sm-8">
- <input id="deleted" name="deleted" th:field="*{deleted}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">自定义字段1：</label>
- <div class="col-sm-8">
- <input id="userDef1" name="userDef1" th:field="*{userDef1}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">自定义字段2：</label>
- <div class="col-sm-8">
- <input id="userDef2" name="userDef2" th:field="*{userDef2}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">自定义字段3：</label>
- <div class="col-sm-8">
- <input id="userDef3" name="userDef3" th:field="*{userDef3}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <div class="form-control-static col-sm-offset-9">
- <button type="submit" class="btn btn-primary">提交</button>
- <button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button>
- </div>
- </div>
- </form>
- </div>
- <div th:include="include::footer"></div>
- <script type="text/javascript">
- var prefix = ctx + "shipment/shipmentHeaderHistory"
- $("#form-shipmentHeaderHistory-edit").validate({
- rules:{
- xxxx:{
- required:true,
- },
- },
- submitHandler: function(form) {
- $.operate.save(prefix + "/edit", $('#form-shipmentHeaderHistory-edit').serialize());
- }
- });
- </script>
-</body>
-</html>
diff --git a/src/main/resources/templates/shipment/shipmentHeaderHistory/shipmentHeaderHistory.html b/src/main/resources/templates/shipment/shipmentHeaderHistory/shipmentHeaderHistory.html
index fc08b07..4e705a0 100644
--- a/src/main/resources/templates/shipment/shipmentHeaderHistory/shipmentHeaderHistory.html
+++ b/src/main/resources/templates/shipment/shipmentHeaderHistory/shipmentHeaderHistory.html
@@ -310,12 +310,6 @@
var actions = [];
actions.push('<a id="table_edit" class="btn btn-success btn-xs ' + printFlag + '" href="#" onclick="receiptPrint(\'' + row.id + '\')"><i class="fa fa-print"></i>打印</a> ');
// actions.push('<a class="btn btn-info btn-xs " href="#" onclick="detail(\'' + row.id + '\',\'' + row.code + '\')"><i class="fa fa-list-ul"></i>列表</a> ');
- if (row.firstStatus < 100){
- actions.push('<a class="btn btn-info btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
- }
- if (row.firstStatus < 120){
- actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a>');
- }
return actions.join('');
}
}]
@@ -449,8 +443,6 @@
align: 'center',
formatter: function (value, row, index) {
var actions = [];
- actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
- actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a>');
return actions.join('');
}
}]