diff --git a/src/main/java/com/zzjee/wave/controller/WaveToDownController.java b/src/main/java/com/zzjee/wave/controller/WaveToDownController.java
index 5d83c8e6..f3854d1c 100644
--- a/src/main/java/com/zzjee/wave/controller/WaveToDownController.java
+++ b/src/main/java/com/zzjee/wave/controller/WaveToDownController.java
@@ -69,6 +69,8 @@ import java.net.URI;
import org.springframework.http.MediaType;
import org.springframework.web.util.UriComponentsBuilder;
+import static com.xiaoleilu.hutool.date.DateTime.now;
+
/**
* @Title: Controller
* @Description: wave_to_down
@@ -391,8 +393,12 @@ public class WaveToDownController extends BaseController {
hql="from WaveToDownEntity where waveId = ? and binId = ?";
listWaveToDowns = waveToDownService.findHql(hql,searchstr,searchstr2);
}
+ System.out.println("11111searchstr3="+searchstr3);
+
if(StringUtil.isNotEmpty(searchstr3)){
for(WaveToDownEntity t: listWaveToDowns ){
+ System.out.println("t.getGoodsId()="+t.getGoodsId());
+ System.out.println("searchstr3="+searchstr3);
try{
if(StringUtil.strPos(t.getGoodsId(),searchstr3)||StringUtil.strPos(t.getShpTiaoMa(),searchstr3)){
listWaveToDownsnew.add(t);
@@ -492,6 +498,8 @@ public class WaveToDownController extends BaseController {
wmToDownGoods.setOmBeizhu(wmOmQmI.getOmBeizhu());//备注
wmToDownGoods.setImCusCode(wmOmQmI.getImCusCode());//客户单号
wmToDownGoods.setOrderType("99");//默认为01
+ wmToDownGoods.setCreateDate(now());
+
systemService.save(wmToDownGoods);
wmOmQmI.setBinSta("H");
wmOmQmI.setFirstRq(waveToDown.getFirstRq());
diff --git a/src/main/java/com/zzjee/wave/controller/WaveToFjController.java b/src/main/java/com/zzjee/wave/controller/WaveToFjController.java
index bec105c7..01ad154d 100644
--- a/src/main/java/com/zzjee/wave/controller/WaveToFjController.java
+++ b/src/main/java/com/zzjee/wave/controller/WaveToFjController.java
@@ -374,10 +374,14 @@ public class WaveToFjController extends BaseController {
String omnoticeid="1";
String siji = "";
String chehao = "";
- for(WaveToFjEntity t:listWaveToFjs) {
+ System.out.println("11111searchstr3="+searchstr3);
+
+ for(WaveToFjEntity t:listWaveToFjs) {
if (StringUtil.isNotEmpty(searchstr3)) {
+ System.out.println("t.getGoodsId()="+t.getGoodsId());
+ System.out.println("searchstr3="+searchstr3);
try{
- if (!StringUtil.strPos(t.getGoodsId(), searchstr3)||StringUtil.strPos(t.getShpTiaoMa(),searchstr3)) {
+ if (!(StringUtil.strPos(t.getGoodsId(), searchstr3)||StringUtil.strPos(t.getShpTiaoMa(),searchstr3))) {
continue;
}
}catch (Exception e){
diff --git a/src/main/java/com/zzjee/wm/controller/WmInQmIController.java b/src/main/java/com/zzjee/wm/controller/WmInQmIController.java
index bd81fc12..3ec503e7 100644
--- a/src/main/java/com/zzjee/wm/controller/WmInQmIController.java
+++ b/src/main/java/com/zzjee/wm/controller/WmInQmIController.java
@@ -258,6 +258,8 @@ public class WmInQmIController extends BaseController {
try{
WmToUpGoodsEntity wmToUpGoodsEntityold = systemService.findUniqueByProperty(WmToUpGoodsEntity.class,"orderIdI",wmInQmIEntity.getId());
if (wmToUpGoodsEntityold!=null){
+ wmInQmIEntity.setBinSta("Y");
+ systemService.saveOrUpdate(wmInQmIEntity);
continue;
}
}catch (Exception e){
diff --git a/src/main/java/com/zzjee/wm/controller/WmOmQmIController.java b/src/main/java/com/zzjee/wm/controller/WmOmQmIController.java
index 69e986d3..1ee30a4e 100644
--- a/src/main/java/com/zzjee/wm/controller/WmOmQmIController.java
+++ b/src/main/java/com/zzjee/wm/controller/WmOmQmIController.java
@@ -361,6 +361,54 @@ public class WmOmQmIController extends BaseController {
return j;
}
+ @RequestMapping(params = "dotowavedown")
+ @ResponseBody
+ public AjaxJson dotowavedown(HttpServletRequest request) {
+ String message = null;
+ AjaxJson j = new AjaxJson();
+ message = "下架成功";
+ try {
+ WmOmQmIEntity wmOmQmI = systemService.getEntity(
+ WmOmQmIEntity.class, request.getParameter("id").toString());
+ if (wmOmQmI != null&&wmOmQmI.getBinSta().equals("N")) {
+ WmToDownGoodsEntity wmToDownGoods = new WmToDownGoodsEntity();
+ wmToDownGoods.setBinIdFrom(wmOmQmI.getTinId());//下架托盘
+ wmToDownGoods.setKuWeiBianMa(wmOmQmI.getBinId());//储位
+ wmToDownGoods.setBinIdTo(wmOmQmI.getOmNoticeId());//到托盘
+ wmToDownGoods.setCusCode(wmOmQmI.getCusCode());//货主
+ wmToDownGoods.setGoodsId(wmOmQmI.getGoodsId());//
+ wmToDownGoods.setGoodsProData(wmOmQmI.getProData());//生产日期
+ wmToDownGoods.setOrderId(wmOmQmI.getOmNoticeId());//出货通知单
+ wmToDownGoods.setOrderIdI(wmOmQmI.getId());//出货通知项目
+ wmToDownGoods.setBaseUnit(wmOmQmI.getBaseUnit());//基本单位
+ wmToDownGoods.setBaseGoodscount(wmOmQmI.getBaseGoodscount());//基本单位数量
+ wmToDownGoods.setGoodsUnit(wmOmQmI.getGoodsUnit());//出货单位
+ wmToDownGoods.setGoodsQua(wmOmQmI.getQmOkQuat());//出货数量
+ wmToDownGoods.setGoodsQuaok(wmOmQmI.getQmOkQuat());//出货数量
+ wmToDownGoods.setGoodsName(wmOmQmI.getGoodsName());//商品名称
+ wmToDownGoods.setOmBeizhu(wmOmQmI.getOmBeizhu());//备注
+ wmToDownGoods.setImCusCode(wmOmQmI.getImCusCode());//客户单号
+ wmToDownGoods.setOrderType("01");//默认为01
+ systemService.save(wmToDownGoods);
+ wmOmQmI.setBinSta("H");
+ systemService.saveOrUpdate(wmOmQmI);
+ systemService.addLog(message, Globals.Log_Type_DEL,
+ Globals.Log_Leavel_INFO);
+ } else {
+ j.setSuccess(false);
+
+ message = "下架任务找不到";
+ }
+
+ } catch (Exception e) {
+ j.setSuccess(false);
+ e.printStackTrace();
+ message = "下架失败";
+ throw new BusinessException(e.getMessage());
+ }
+ j.setMsg(message);
+ return j;
+ }
@RequestMapping(params = "dotodown")
diff --git a/src/main/webapp/webpage/com/zzjee/wm/wmOmQmIList.jsp b/src/main/webapp/webpage/com/zzjee/wm/wmOmQmIList.jsp
index cb32efd4..0b71c078 100644
--- a/src/main/webapp/webpage/com/zzjee/wm/wmOmQmIList.jsp
+++ b/src/main/webapp/webpage/com/zzjee/wm/wmOmQmIList.jsp
@@ -14,6 +14,8 @@
+
+
@@ -28,7 +30,7 @@
-
+
<%-- --%>
@@ -36,7 +38,6 @@
<%-- --%>
-
<%-- --%>
<%-- --%>
@@ -46,6 +47,7 @@
<%-- --%>
+
@@ -62,7 +64,7 @@
-
+
\ No newline at end of file
+
diff --git a/src/main/webapp/webpage/com/zzjee/wm/wminqmbatchList.jsp b/src/main/webapp/webpage/com/zzjee/wm/wminqmbatchList.jsp
index 0a003527..2228d225 100644
--- a/src/main/webapp/webpage/com/zzjee/wm/wminqmbatchList.jsp
+++ b/src/main/webapp/webpage/com/zzjee/wm/wminqmbatchList.jsp
@@ -3,7 +3,7 @@