From 938d10604366db71cb73fddc2320fb573b7949f2 Mon Sep 17 00:00:00 2001
From: 18516761980 <tqsxp@163.com>
Date: 星期五, 25 十一月 2022 10:06:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'aliyun/hylyasrs' into hylyasrs
---
src/main/java/com/zy/asrs/controller/OrderController.java | 95 +++++++++++++++++++
src/main/java/com/zy/asrs/mapper/LocDetlMapper.java | 3
src/main/webapp/views/wrkMast/wrkDetl.html | 1
src/main/java/com/zy/asrs/service/LocDetlService.java | 4
src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java | 3
src/main/resources/mapper/LocDetlMapper.xml | 12 ++
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 5 +
src/main/java/com/zy/common/model/LocDto.java | 2
src/main/webapp/static/js/stoMan/stoQue.js | 16 +-
pom.xml | 8 +
src/main/webapp/static/js/cool.js | 2
src/main/webapp/views/order/order.html | 4
src/main/resources/mapper/OrderDetlMapper.xml | 19 ++-
src/main/java/com/zy/asrs/service/OrderDetlService.java | 2
src/main/webapp/static/js/order/out.js | 4
src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java | 13 ++
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 3
src/main/webapp/static/js/order/order.js | 7 +
src/main/webapp/views/order/out.html | 2
src/main/java/com/zy/asrs/controller/OutController.java | 81 ++++++++++++++++
src/main/java/com/zy/asrs/entity/LocMast.java | 6
src/main/webapp/views/login.html | 1
src/main/resources/application.yml | 2
23 files changed, 269 insertions(+), 26 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3baad37..e0b5149 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,8 +22,16 @@
<springfox.version>2.7.0</springfox.version>
</properties>
+
+
<dependencies>
<dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>1.4.7</version>
+ </dependency>
+
+ <dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 8063a13..e65522e 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -33,6 +33,8 @@
private WrkDetlService wrkDetlService;
@Autowired
private WaitPakinService waitPakinService;
+ @Autowired
+ private LocDetlService locDetlService;
@RequestMapping(value = "/order/nav/list/auth")
@ManagerAuth
@@ -334,4 +336,97 @@
return R.ok();
}
+
+ @RequestMapping(value = "/order/form/add/authtest")
+ @ManagerAuth(memo = "鎵嬪姩娣诲姞璁㈠崟")
+ @Transactional
+ public R formAddTest(@RequestBody OrderDomainParam param){
+ if(Cools.isEmpty(param.getOrderNo())){
+ String prefix = "";
+ DocType docType = docTypeService.selectById(param.getDocType());
+ if(!Cools.isEmpty(docType)){
+ prefix = docType.getPakin() == 1 ? "RK" : "CK";
+ }
+ param.setOrderNo(prefix + snowflakeIdWorker.nextId());
+ }
+ Order order = orderService.selectByNo(param.getOrderNo());
+ if (order != null) {
+ return R.error("鍗曟嵁缂栧彿宸插瓨鍦�");
+ }
+ Date now = new Date();
+ order = new Order(
+ String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
+ param.getOrderNo(), // 璁㈠崟缂栧彿
+ DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
+ param.getDocType(), // 鍗曟嵁绫诲瀷
+ null, // 椤圭洰缂栧彿
+ null, //
+ null, // 璋冩嫧椤圭洰缂栧彿
+ null, // 鍒濆绁ㄦ嵁鍙�
+ null, // 绁ㄦ嵁鍙�
+ null, // 瀹㈡埛缂栧彿
+ null, // 瀹㈡埛
+ null, // 鑱旂郴鏂瑰紡
+ null, // 鎿嶄綔浜哄憳
+ null, // 鍚堣閲戦
+ null, // 浼樻儬鐜�
+ null, // 浼樻儬閲戦
+ null, // 閿�鍞垨閲囪喘璐圭敤鍚堣
+ null, // 瀹炰粯閲戦
+ null, // 浠樻绫诲瀷
+ null, // 涓氬姟鍛�
+ null, // 缁撶畻澶╂暟
+ null, // 閭垂鏀粯绫诲瀷
+ null, // 閭垂
+ null, // 浠樻鏃堕棿
+ null, // 鍙戣揣鏃堕棿
+ null, // 鐗╂祦鍚嶇О
+ null, // 鐗╂祦鍗曞彿
+ 1L, // 璁㈠崟鐘舵��
+ 1, // 鐘舵��
+ getUserId(), // 娣诲姞浜哄憳
+ now, // 娣诲姞鏃堕棿
+ getUserId(), // 淇敼浜哄憳
+ now, // 淇敼鏃堕棿
+ null // 澶囨敞
+ );
+ if (!orderService.insert(order)) {
+ throw new CoolException("淇濆瓨璁㈠崟涓绘。澶辫触");
+ }
+ List<DetlDto> list = new ArrayList<>();
+ for (OrderDetl orderDetl : param.getOrderDetlList()) {
+ DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch());
+ if (DetlDto.has(list, dto)) {
+ OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch());
+ item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
+ if (!orderDetlService.updateById(item)) {
+ throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
+ }
+ } else {
+ list.add(dto);
+ orderDetl.setOrderId(order.getId());
+ orderDetl.setOrderNo(order.getOrderNo());
+ orderDetl.setCreateBy(getUserId());
+ orderDetl.setCreateTime(now);
+ orderDetl.setUpdateBy(getUserId());
+ orderDetl.setUpdateTime(now);
+ orderDetl.setStatus(1);
+ orderDetl.setQty(0.0D);
+
+ //缁欐坊鍔犲瓙璁㈠崟
+ Set<String> exist = new HashSet<>();
+ List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist);
+
+
+ if (!orderDetlService.insert(orderDetl)) {
+ throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
+ }
+ }
+ }
+ return R.ok("璁㈠崟娣诲姞鎴愬姛");
+ }
+
+
+
+
}
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 0d2ba7d..85ea98c 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -64,7 +64,10 @@
for (OrderDetl orderDetl : orderDetls) {
double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getQty()).orElse(0.0D);
if (issued <= 0.0D) { continue; }
+
List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist);
+
+ System.out.println(locDetls);
for (LocDetl locDetl : locDetls) {
if (issued > 0) {
LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
@@ -111,6 +114,11 @@
// 鏍规嵁 锛堝簱浣� & 鍑哄簱绔欙級 鍒嗙粍锛� 鐞嗘兂鐘舵�侊細涓�缁勪负涓�娆″嚭搴撲换鍔�
for (LocDto locDto : locDtos) {
if (locDto.isLack()) { continue; }
+
+ //娣诲姞閮ㄥ垎:澧炲姞宸ヤ綔鏁伴噺
+ // orderDetlService.increaseWorkQtytest(locDto.getOrderNo(),locDto.getMatnr(),locDto.getBatch(),locDto.getAnfme());
+
+
TaskDto taskDto = new TaskDto(locDto.getLocNo(), locDto.getStaNo(), locDto);
if (TaskDto.has(taskDtos, taskDto)) {
TaskDto dto = TaskDto.find(taskDtos, taskDto);
@@ -128,4 +136,77 @@
return R.ok();
}
+ @PostMapping("/out/pakout/preview/authtest")
+ @ManagerAuth
+ public R pakoutPreviewtest(@RequestBody List<Long> ids) {
+ if (Cools.isEmpty(ids)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids);
+ List<LocDto> locDtos = new ArrayList<>();
+
+ Set<String> exist = new HashSet<>();
+
+ boolean boo=false;
+
+ for (OrderDetl orderDetl : orderDetls) {
+ double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
+ if (issued <= 0.0D) { continue; }
+
+ List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist);
+
+ if(!Cools.isEmpty(locDetls)){
+ boo=true;
+ //鍒ゆ柇鍑哄簱鏁伴噺鏄惁澶т簬瑕佸嚭鐨勭墿鍝�
+ LocDto locDtoo = new LocDto(locDetls.get(0).getLocNo(), locDetls.get(0).getMatnr(), locDetls.get(0).getMaktx(), locDetls.get(0).getBatch(), orderDetl.getOrderNo(),
+ issued >= locDetls.get(0).getAnfme() ? locDetls.get(0).getAnfme() : issued);
+ List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetls.get(0).getLocNo(), issued >= locDetls.get(0).getAnfme() ? 101 : 103);
+ locDtoo.setStaNos(staNos);
+ if(issued<locDetls.get(0).getAnfme()){
+
+ locDtos.add(locDtoo);
+ exist.add(locDetls.get(0).getLocNo());
+ break;
+ }else if(issued==locDetls.get(0).getAnfme()){
+
+ locDtos.add(locDtoo);
+ exist.add(locDetls.get(0).getLocNo());
+ break;
+ }else {
+
+ locDtos.add(locDtoo);
+ exist.add(locDetls.get(0).getLocNo());
+ issued=issued-locDetls.get(0).getAnfme();
+ }
+ }
+ List<LocDetl> locDetlList =new ArrayList<>();
+ if(boo){
+ locDetlList=locDetlService.queryStockOther(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist,locDetls.get(0).getLocNo());
+ }else{
+ locDetlList=locDetlService.queryStockOther(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist,null);
+ }
+ for (LocDetl locDetl : locDetlList) {
+ if (issued > 0) {
+ LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
+ issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
+ List<Integer> staNoss = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 103);
+ locDto.setStaNos(staNoss);
+
+ locDtos.add(locDto);
+ exist.add(locDetl.getLocNo());
+ // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
+ issued = issued - locDetl.getAnfme();
+ } else {
+ break;
+ }
+ }
+ if (issued > 0) {
+ LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
+ locDto.setLack(Boolean.TRUE);
+ locDtos.add(locDto);
+ }
+ }
+ return R.ok().add(locDtos);
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index 23d8301..0ee2575 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -26,8 +26,8 @@
/**
* 搴撲綅鍙�
*/
- @ApiModelProperty(value= "搴撲綅鍙�")
- @TableId(value = "loc_no", type = IdType.INPUT)
+ @ApiModelProperty(value= "搴撲綅鍙�") //鍙傛暟绫诲瀷涓篠tring锛屼綔鐢ㄤ负姝ゅ睘鎬х殑绠�瑕佹弿杩般��
+ @TableId(value = "loc_no", type = IdType.INPUT) // @TableId 娉ㄨВ鐨勭敤娉曪紝璇ユ敞瑙ｇ敤浜庡皢鏌愪釜鎴愬憳鍙橀噺鎸囧畾涓烘暟鎹〃涓婚敭
@TableField("loc_no")
private String locNo;
@@ -165,7 +165,7 @@
@ApiModelProperty(value= "")
private String mk;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "鏉＄爜鍙�")
private String barcode;
@ApiModelProperty(value= "")
diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index c33ab13..93265cb 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -56,6 +56,9 @@
List<LocDetl> queryStock(@Param("matnr")String matnr, @Param("batch")String batch, @Param("orderNo")String orderNo, @Param("locNos") Set<String> locNos);
+ List<LocDetl> queryStockOther(@Param("matnr")String matnr, @Param("batch")String batch, @Param("orderNo")String orderNo, @Param("locNos") Set<String> locNos,@Param("locNo")String locNo);
+
+
Double queryStockAnfme(String matnr, String batch);
List<StockVo> queryStockTotal();
diff --git a/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java b/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
index 51c99ad..b67806c 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
@@ -34,4 +34,7 @@
int increaseQtyByOrderNo(@Param("orderNo")String orderNo, @Param("matnr")String matnr, @Param("batch")String batch, @Param("qty")Double qty);
int increaseWorkQty(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("workQty")Double workQty);
+
+ int increaseWorkQtytest(@Param("orderNo")String orderNo, @Param("matnr")String matnr, @Param("batch")String batch, @Param("anfme")Double anfme);
+
}
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index 0023ecf..e4d53c5 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.result.StockVo;
+import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
@@ -45,6 +46,9 @@
List<LocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos);
+ List<LocDetl> queryStockOther(String matnr, String batch, String orderNo, Set<String> locNos,String locNo);
+
+
Double queryStockAnfme(String matnr, String batch);
List<StockVo> queryStockTotal();
diff --git a/src/main/java/com/zy/asrs/service/OrderDetlService.java b/src/main/java/com/zy/asrs/service/OrderDetlService.java
index ecf08d2..ede8c56 100644
--- a/src/main/java/com/zy/asrs/service/OrderDetlService.java
+++ b/src/main/java/com/zy/asrs/service/OrderDetlService.java
@@ -37,4 +37,6 @@
* @return
*/
boolean increaseWorkQty(Long orderId, String matnr, String batch, Double workQty);
+
+ boolean increaseWorkQtytest(String orderNo, String matnr, String batch, Double anfme);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
index 44bdd07..bbb6957 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -82,6 +82,11 @@
}
@Override
+ public List<LocDetl> queryStockOther(String matnr, String batch, String orderNo, Set<String> locNos,String locNo) {
+ return this.baseMapper.queryStockOther(matnr, batch, orderNo, locNos,locNo);
+ }
+
+ @Override
public Double queryStockAnfme(String matnr, String batch) {
return this.baseMapper.queryStockAnfme(matnr, batch);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
index 327edbb..3e98ae8 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
@@ -90,4 +90,17 @@
public boolean increaseWorkQty(Long orderId, String matnr, String batch, Double workQty) {
return this.baseMapper.increaseWorkQty(orderId, matnr, batch, workQty) > 0;
}
+
+ /**
+ * 鍏ュ嚭搴撲换鍔＄敓鎴愭椂锛屾洿鏂板崟鎹〃涓綔涓氭暟閲�
+ * @param orderNo
+ * @param matnr
+ * @param batch
+ * @param anfme
+ * @return
+ */
+ @Override
+ public boolean increaseWorkQtytest(String orderNo, String matnr, String batch, Double anfme) {
+ return this.baseMapper.increaseWorkQtytest(orderNo, matnr, batch, anfme) > 0;
+ }
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 3ebff2a..40b0221 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -802,6 +802,7 @@
if(wrkMast.getIoType() == 101 || wrkMast.getIoType() == 103) {
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
for (WrkDetl wrkDetl : wrkDetls) {
+ //瀛楃涓蹭笉涓虹┖
if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
if (!orderDetlService.decrease(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme())) {
throw new CoolException("璁㈠崟鏁版嵁鍥炴粴澶辫触");
@@ -811,7 +812,7 @@
boolean flag = true;
List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no",wrkDetl.getOrderNo()));
for(OrderDetl orderDetl : orderDetls){
- if(orderDetl.getWorkQty() > 0){
+ if(orderDetl.getQty() > 0){
flag = false;
}
}
diff --git a/src/main/java/com/zy/common/model/LocDto.java b/src/main/java/com/zy/common/model/LocDto.java
index ca099a3..b78237e 100644
--- a/src/main/java/com/zy/common/model/LocDto.java
+++ b/src/main/java/com/zy/common/model/LocDto.java
@@ -25,10 +25,12 @@
private boolean lack = false;
+ //鐩爣绔欑偣
private List<Integer> staNos;
private Integer staNo;
+
public LocDto() {
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 9a03104..f2a3072 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -10,7 +10,7 @@
enabled: false
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=gzynasrs
+ url: jdbc:sqlserver://localhost:1433;databasename=hylyasrs
username: sa
password: sa@123
mvc:
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 0869303..330d26f 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -282,6 +282,18 @@
desc
</select>
+ <select id="queryStockOther" resultMap="BaseResultMap">
+ select a.*
+ from asr_loc_detl a
+ left join asr_loc_mast b on a.loc_no = b.loc_no
+ where 1=1
+ and b.loc_sts = 'F'
+ and a.matnr= #{matnr}
+ <if test="locNo !=null and locNo !=''">
+ and a.loc_no != #{locNo}
+ </if>
+
+ </select>
<select id="queryStockAnfme" resultType="java.lang.Double">
select sum(anfme) as count from man_loc_detl
where 1=1
diff --git a/src/main/resources/mapper/OrderDetlMapper.xml b/src/main/resources/mapper/OrderDetlMapper.xml
index 74ebaf0..bb7dc9f 100644
--- a/src/main/resources/mapper/OrderDetlMapper.xml
+++ b/src/main/resources/mapper/OrderDetlMapper.xml
@@ -127,7 +127,7 @@
<update id="increase">
update man_order_detl
- set qty = qty + #{qty}
+ set work_qty = work_qty + #{qty}
where 1=1
and order_id = #{orderId}
and matnr = #{matnr}
@@ -147,14 +147,7 @@
where 1=1
and order_no = #{orderNo}
and matnr = #{matnr}
- <choose>
- <when test="batch != null and batch != ''">
- and batch = #{batch}
- </when>
- <otherwise>
- and (batch IS NULL OR batch = '')
- </otherwise>
- </choose>
+
</update>
<update id="modifyStatus">
@@ -200,4 +193,12 @@
</choose>
</update>
+ <update id="increaseWorkQtytest">
+ update man_order_detl
+ set work_qty = work_qty + #{anfme}
+ where 1=1
+ and order_no = #{orderNo}
+ and matnr = #{matnr};
+ </update>
+
</mapper>
diff --git a/src/main/webapp/static/js/cool.js b/src/main/webapp/static/js/cool.js
index d817c09..688e893 100644
--- a/src/main/webapp/static/js/cool.js
+++ b/src/main/webapp/static/js/cool.js
@@ -15,7 +15,9 @@
*/
function autoShow(id) {
var cac = document.getElementById(id).parentNode;
+ console.log(cac);
var cacw = cac.getElementsByClassName("cool-auto-complete-window")[0];
+ console.log(cacw);
if (cacw.style.display === "none" || cacw.style.display === ""){
cacw.style.display = "block";
var cacwi = cacw.getElementsByClassName("cool-auto-complete-window-input")[0];
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index e277615..b7bac8b 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -31,6 +31,10 @@
}
}
})
+
+
+
+
// 娓叉煋琛ㄦ牸
var insTb = table.render({
@@ -195,7 +199,7 @@
}
layer.load(2);
$.ajax({
- url: baseUrl+"/order/form/" + (isExpAdd?"add":"modify") + "/auth",
+ url: baseUrl+"/order/form/" + (isExpAdd?"add":"modify") + "/authtest",
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify({
orderId: Number(data.field.id),
@@ -389,6 +393,7 @@
});
}
})
+
// 寮圭獥涓嶅嚭鐜版粴鍔ㄦ潯
$(layero).children('.layui-layer-content').css('overflow', 'visible');
layui.form.render('select');
diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js
index be85831..96d77dc 100644
--- a/src/main/webapp/static/js/order/out.js
+++ b/src/main/webapp/static/js/order/out.js
@@ -125,8 +125,9 @@
function pakoutPreview(ids) {
let loadIndex = layer.load(2);
+ console.log("1111")
$.ajax({
- url: baseUrl + "/out/pakout/preview/auth",
+ url: baseUrl + "/out/pakout/preview/authtest",
headers: {'token': localStorage.getItem('token')},
contentType: 'application/json;charset=UTF-8',
data: JSON.stringify(ids),
@@ -163,6 +164,7 @@
{field: 'anfme', title: '鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'},
{field: 'locNo', title: '璐т綅', align: 'center', width: 100, templet: '#locNoTpl'},
{field: 'staNos', align: 'center', title: '鍑哄簱绔�', merge: ['locNo'], templet: '#tbBasicTbStaNos'},
+ //{field: 'staState', title: '鐘舵��', align: 'center'},
{type: 'checkbox', merge: ['locNo']},
]],
done: function (res) {
diff --git a/src/main/webapp/static/js/stoMan/stoQue.js b/src/main/webapp/static/js/stoMan/stoQue.js
index 76e6a1b..b6fc115 100644
--- a/src/main/webapp/static/js/stoMan/stoQue.js
+++ b/src/main/webapp/static/js/stoMan/stoQue.js
@@ -4,21 +4,21 @@
var table = layui.table;
var $ = layui.jquery;
var layer = layui.layer;
- var layDate = layui.laydate;
+ var layDate = layui.laydate; //鏃堕棿鎺т欢
var form = layui.form;
layDate.render({
elem: '.layui-laydate-range'
- ,type: 'datetime'
- ,range: true
+ ,type: 'datetime' //鏃ユ湡鏃堕棿閫夋嫨鍣� 鍙�夊勾銆佹湀銆佹棩銆佹椂銆佸垎銆佺
+ ,range: true //璁剧疆涓簍rue锛岄粯璁ら噰鐢ㄢ��-鈥濆垎鍓�
});
// 鏁版嵁娓叉煋
tableIns = table.render({
- elem: '#stoQue',
+ elem: '#stoQue', //table id=鈥渟toQue鈥�
headers: {token: localStorage.getItem('token')},
url: baseUrl+'/locMast/list/auth',
- page: true,
+ page: true, //寮�鍚垎椤�
limit: 20,
limits: [20, 30, 50, 100, 200, 500],
even: true,
@@ -110,8 +110,8 @@
case 'refreshSto': // todo:luxiaotao
alert("杩樻病鍋�");
break;
- case 'exportData':
- layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
+ case 'exportData': //瀵煎嚭Excel
+ layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
var titles=[];
var fields=[];
obj.config.cols[0].map(function (col) {
@@ -129,7 +129,7 @@
'fields': fields
};
$.ajax({
- url: baseUrl+"/wrkLastno/export/auth",
+ url: baseUrl+"/locMast/export/auth",
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify(param),
dataType:'json',
diff --git a/src/main/webapp/views/login.html b/src/main/webapp/views/login.html
index d7aa305..b9dc922 100644
--- a/src/main/webapp/views/login.html
+++ b/src/main/webapp/views/login.html
@@ -74,6 +74,7 @@
<input id="username" class="input100" type="text" name="username" placeholder="username" autocomplete="off">
<span class="focus-input100"></span>
<span class="symbol-input100">
+
<i class="fa fa-user"></i>
</span>
</div>
diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index f5997c4..2892005 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -54,6 +54,8 @@
</select>
</div>
</div>
+
+
<div class="layui-inline">
<div class="layui-input-inline">
<select name="settle">
@@ -176,7 +178,7 @@
<div id="mat" name="mat">
</div>
</div>
- </div>
+
<div class="layui-form-item text-right" style="display: inline-block; margin-left: 35px">
<button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
<button class="layui-btn" lay-filter="matEditSubmit" lay-submit>淇濆瓨</button>
diff --git a/src/main/webapp/views/order/out.html b/src/main/webapp/views/order/out.html
index 9a59d23..a010ce9 100644
--- a/src/main/webapp/views/order/out.html
+++ b/src/main/webapp/views/order/out.html
@@ -152,7 +152,7 @@
<!-- 琛屽伐鍏锋爮 -->
<script type="text/html" id="operate">
- {{#if (d.anfme > d.qty){ }}
+ {{#if (d.anfme > d.workQty){ }}
<a class="layui-btn layui-btn-xs layui-btn-danger btn-pakoutPreview" lay-event="pakoutPreview"><i class="layui-icon layui-icon-prev-circle"></i>鍑哄簱</a>
{{# } }}
</script>
diff --git a/src/main/webapp/views/wrkMast/wrkDetl.html b/src/main/webapp/views/wrkMast/wrkDetl.html
index af87049..8830b51 100644
--- a/src/main/webapp/views/wrkMast/wrkDetl.html
+++ b/src/main/webapp/views/wrkMast/wrkDetl.html
@@ -32,6 +32,7 @@
var cols = [
{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿'}
+ ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿'}
];
cols.push.apply(cols, detlCols);
return cols;
--
Gitblit v1.9.1