zcy
/
jee_wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/zzjee/md/entity/MvGoodsEntity.java
View File

@ -79,6 +79,8 @@ public class MvGoodsEntity implements java.io.Serializable {
/**高整箱*/
@Excel(name="高")
private java.lang.String gaoZhXiang;
@Excel(name="产品属性")
private java.lang.String chpShuXing;
@Id
@GeneratedValue(generator = "paymentableGenerator")
@GenericGenerator(name = "paymentableGenerator", strategy = "uuid")
@ -414,4 +416,16 @@ public class MvGoodsEntity implements java.io.Serializable {
*方法: 取得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;
}
}

17
src/main/java/com/zzjee/wave/controller/WaveToDownController.java
View File

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

7
src/main/java/com/zzjee/wave/controller/WaveToFjController.java
View File

@ -463,12 +463,15 @@ public class WaveToFjController extends BaseController {
WmOmNoticeHEntity wmom = systemService.findUniqueByProperty(WmOmNoticeHEntity.class, "omNoticeId", omnoticeid);
wmom.setOmSta("操作中");
systemService.updateEntitie(wmom);
D0.setOK(true);
}
} catch (Exception e) {
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)

2
src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java
View File

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

10
src/main/java/com/zzjee/wm/controller/WmOmQmIController.java
View File

@ -239,6 +239,16 @@ public class WmOmQmIController extends BaseController {
if(StringUtil.isNotEmpty(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.addLog(message, Globals.Log_Type_UPDATE,
Globals.Log_Leavel_INFO);

15
src/main/java/com/zzjee/wm/entity/WmImNoticeIEntity.java
View File

@ -122,6 +122,9 @@ public class WmImNoticeIEntity implements java.io.Serializable {
/**保质期*/
// @Excel(name="保质期")
private java.lang.String bzhiQi;
/**产品属性*/
@Excel(name="产品属性")
private java.lang.String chpShuXing;
/**
*方法: 取得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){
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;
}
}

19
src/main/java/com/zzjee/wm/entity/WmOmNoticeIEntity.java
View File

@ -120,7 +120,9 @@ public class WmOmNoticeIEntity implements java.io.Serializable {
private java.lang.String planSta;
private java.lang.String binId;
/**产品属性*/
@Excel(name="产品属性")
private java.lang.String chpShuXing;
/**
*方法: 取得java.lang.String
@ -664,6 +666,21 @@ public class WmOmNoticeIEntity implements java.io.Serializable {
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;
}
}

2
src/main/java/com/zzjee/wm/service/impl/WmImNoticeHServiceImpl.java
View File

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

2
src/main/java/com/zzjee/wm/service/impl/WmOmNoticeHServiceImpl.java
View File

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