1,波次分拣

2,商品属性
master
erzhongxmu 2020-12-20 23:50:48 +08:00
parent 165d06b533
commit d6805016bb
9 changed files with 165 additions and 101 deletions

View File

@ -79,6 +79,8 @@ public class MvGoodsEntity implements java.io.Serializable {
/**高整箱*/ /**高整箱*/
@Excel(name="高") @Excel(name="高")
private java.lang.String gaoZhXiang; private java.lang.String gaoZhXiang;
@Excel(name="产品属性")
private java.lang.String chpShuXing;
@Id @Id
@GeneratedValue(generator = "paymentableGenerator") @GeneratedValue(generator = "paymentableGenerator")
@GenericGenerator(name = "paymentableGenerator", strategy = "uuid") @GenericGenerator(name = "paymentableGenerator", strategy = "uuid")
@ -414,4 +416,16 @@ public class MvGoodsEntity implements java.io.Serializable {
*: java.lang.String *: java.lang.String
*@return: java.lang.String *@return: java.lang.String
*/ */
@Column(name ="CHP_SHU_XING",nullable=true,length=32)
public java.lang.String getChpShuXing(){
return this.chpShuXing;
}
/**
*: java.lang.String
*@param: java.lang.String
*/
public void setChpShuXing(java.lang.String chpShuXing){
this.chpShuXing = chpShuXing;
}
} }

View File

@ -461,12 +461,15 @@ public class WaveToDownController extends BaseController {
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
return new ResponseEntity(HttpStatus.NO_CONTENT); D0.setOK(false);
return new ResponseEntity(D0, HttpStatus.OK);
} }
D0.setOK(true);
return new ResponseEntity(D0, HttpStatus.OK);
return new ResponseEntity(waveToDown, HttpStatus.OK); }
}
@RequestMapping(value = "/jsondown", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE) @RequestMapping(value = "/jsondown", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<?> update(@RequestBody WaveToDownEntity waveToDown) { public ResponseEntity<?> update(@RequestBody WaveToDownEntity waveToDown) {
@ -505,14 +508,14 @@ public class WaveToDownController extends BaseController {
wmOmQmI.setFirstRq(waveToDown.getFirstRq()); wmOmQmI.setFirstRq(waveToDown.getFirstRq());
systemService.saveOrUpdate(wmOmQmI); systemService.saveOrUpdate(wmOmQmI);
} }
D0.setOK(true);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
return new ResponseEntity(HttpStatus.NO_CONTENT); D0.setOK(false);
return new ResponseEntity(D0, HttpStatus.OK);
} }
return new ResponseEntity(D0, HttpStatus.OK);
return new ResponseEntity(waveToDown, HttpStatus.OK);
} }
@RequestMapping(value = "/{id}", method = RequestMethod.DELETE) @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)

View File

@ -463,12 +463,15 @@ public class WaveToFjController extends BaseController {
WmOmNoticeHEntity wmom = systemService.findUniqueByProperty(WmOmNoticeHEntity.class, "omNoticeId", omnoticeid); WmOmNoticeHEntity wmom = systemService.findUniqueByProperty(WmOmNoticeHEntity.class, "omNoticeId", omnoticeid);
wmom.setOmSta("操作中"); wmom.setOmSta("操作中");
systemService.updateEntitie(wmom); systemService.updateEntitie(wmom);
D0.setOK(true);
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
return new ResponseEntity(HttpStatus.NO_CONTENT); D0.setOK(false);
return new ResponseEntity(D0, HttpStatus.OK);
} }
return new ResponseEntity(waveToFj, HttpStatus.OK); return new ResponseEntity(D0, HttpStatus.OK);
} }
@RequestMapping(value = "/jsonfj", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE) @RequestMapping(value = "/jsonfj", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)

View File

@ -2721,7 +2721,7 @@ public class WmOmNoticeHController extends BaseController {
// hql="from WmImNoticeIEntity where noticeiSta <> ? and omNoticeId = ?"; // hql="from WmImNoticeIEntity where noticeiSta <> ? and omNoticeId = ?";
// listWaveToDowns = wmOmNoticeHService.findHql(hql,"已核货",searchstr); // listWaveToDowns = wmOmNoticeHService.findHql(hql,"已核货",searchstr);
// hql="from WmOmNoticeIEntity "; // hql="from WmOmNoticeIEntity ";
hql="from WmOmNoticeIEntity where omNoticeId = ? order by goodsId"; hql="from WmOmNoticeIEntity where omNoticeId = ? order by chpShuXing";
// listWaveToDowns = wmOmNoticeHService.findHql(hql); // listWaveToDowns = wmOmNoticeHService.findHql(hql);
listWaveToDowns = wmOmNoticeHService.findHql(hql, omnoticeid); listWaveToDowns = wmOmNoticeHService.findHql(hql, omnoticeid);
D0.setObj(listWaveToDowns); D0.setObj(listWaveToDowns);

View File

@ -239,6 +239,16 @@ public class WmOmQmIController extends BaseController {
if(StringUtil.isNotEmpty(firstrongqi)){ if(StringUtil.isNotEmpty(firstrongqi)){
t.setFirstRq(firstrongqi); t.setFirstRq(firstrongqi);
} }
String recarno = "";
try{
WmOmNoticeHEntity wmOmNoticeHEntity = systemService.findUniqueByProperty(WmOmNoticeHEntity.class,"omNoticeId",t.getOmNoticeId());
recarno = wmOmNoticeHEntity.getReCarno();
}catch (Exception e){
}
t.setSecondRq(recarno);
systemService.updateEntitie(t); systemService.updateEntitie(t);
systemService.addLog(message, Globals.Log_Type_UPDATE, systemService.addLog(message, Globals.Log_Type_UPDATE,
Globals.Log_Leavel_INFO); Globals.Log_Leavel_INFO);

View File

@ -122,6 +122,9 @@ public class WmImNoticeIEntity implements java.io.Serializable {
/**保质期*/ /**保质期*/
// @Excel(name="保质期") // @Excel(name="保质期")
private java.lang.String bzhiQi; private java.lang.String bzhiQi;
/**产品属性*/
@Excel(name="产品属性")
private java.lang.String chpShuXing;
/** /**
*: java.lang.String *: java.lang.String
*@return: java.lang.String *@return: java.lang.String
@ -695,4 +698,16 @@ public class WmImNoticeIEntity implements java.io.Serializable {
public void setBzhiQi(java.lang.String bzhiQi){ public void setBzhiQi(java.lang.String bzhiQi){
this.bzhiQi = bzhiQi; this.bzhiQi = bzhiQi;
} }
@Column(name ="CHP_SHU_XING",nullable=true,length=32)
public java.lang.String getChpShuXing(){
return this.chpShuXing;
}
/**
*: java.lang.String
*@param: java.lang.String
*/
public void setChpShuXing(java.lang.String chpShuXing){
this.chpShuXing = chpShuXing;
}
} }

View File

@ -120,7 +120,9 @@ public class WmOmNoticeIEntity implements java.io.Serializable {
private java.lang.String planSta; private java.lang.String planSta;
private java.lang.String binId; private java.lang.String binId;
/**产品属性*/
@Excel(name="产品属性")
private java.lang.String chpShuXing;
/** /**
*: java.lang.String *: java.lang.String
@ -664,6 +666,21 @@ public class WmOmNoticeIEntity implements java.io.Serializable {
this.imCusCode = imCusCode; this.imCusCode = imCusCode;
} }
/**
*: java.lang.String
*@param: java.lang.String
*/
@Column(name ="CHP_SHU_XING",nullable=true,length=32)
public java.lang.String getChpShuXing(){
return this.chpShuXing;
}
/**
*: java.lang.String
*@param: java.lang.String
*/
public void setChpShuXing(java.lang.String chpShuXing){
this.chpShuXing = chpShuXing;
}
} }

View File

@ -52,7 +52,7 @@ public class WmImNoticeHServiceImpl extends CommonServiceImpl implements WmImNot
if(mvgoods!=null){ if(mvgoods!=null){
wmImNoticeI.setGoodsName(mvgoods.getGoodsName()); wmImNoticeI.setGoodsName(mvgoods.getGoodsName());
wmImNoticeI.setBarCode(mvgoods.getShpTiaoMa()); wmImNoticeI.setBarCode(mvgoods.getShpTiaoMa());
wmImNoticeI.setChpShuXing(mvgoods.getChpShuXing());
try { try {
try { try {
wmImNoticeI.setGoodsFvol(String.valueOf(Double.parseDouble(mvgoods.getTiJiCm())*Double.parseDouble(wmImNoticeI.getGoodsCount()))); wmImNoticeI.setGoodsFvol(String.valueOf(Double.parseDouble(mvgoods.getTiJiCm())*Double.parseDouble(wmImNoticeI.getGoodsCount())));

View File

@ -55,6 +55,8 @@ public class WmOmNoticeHServiceImpl extends CommonServiceImpl implements WmOmNot
if(mvgoods!=null){ if(mvgoods!=null){
huowu=huowu+mvgoods.getGoodsName(); huowu=huowu+mvgoods.getGoodsName();
wmOmNoticeI.setGoodsName(mvgoods.getGoodsName()); wmOmNoticeI.setGoodsName(mvgoods.getGoodsName());
wmOmNoticeI.setChpShuXing(mvgoods.getChpShuXing());//产品属性
try{ try{
wmOmNoticeI.setBaseUnit(mvgoods.getBaseunit()); wmOmNoticeI.setBaseUnit(mvgoods.getBaseunit());
wmOmNoticeI.setGoodsUnit(mvgoods.getShlDanWei()); wmOmNoticeI.setGoodsUnit(mvgoods.getShlDanWei());