diff --git a/src/main/java/com/zzjee/md/entity/MvGoodsEntity.java b/src/main/java/com/zzjee/md/entity/MvGoodsEntity.java index 5c39adaf..6847bdb1 100644 --- a/src/main/java/com/zzjee/md/entity/MvGoodsEntity.java +++ b/src/main/java/com/zzjee/md/entity/MvGoodsEntity.java @@ -9,12 +9,12 @@ import javax.persistence.Table; import org.hibernate.annotations.GenericGenerator; import org.jeecgframework.poi.excel.annotation.Excel; -/** +/** * @Title: Entity * @Description: 商品视图 * @author erzhongxmu * @date 2017-09-11 20:01:15 - * @version V1.0 + * @version V1.0 * */ @Entity @@ -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") @@ -94,7 +96,7 @@ public class MvGoodsEntity implements java.io.Serializable { public void setId(java.lang.String id){ this.id = id; } - + /** *方法: 取得java.lang.String *@return: java.lang.String cusCode @@ -115,7 +117,7 @@ public class MvGoodsEntity implements java.io.Serializable { *方法: 取得java.lang.String *@return: java.lang.String goodsCode */ - + @Column(name ="GOODS_ID",nullable=true,length=33) public java.lang.String getGoodsId(){ return this.goodsId; @@ -128,7 +130,7 @@ public class MvGoodsEntity implements java.io.Serializable { public void setGoodsId(java.lang.String goodsId){ this.goodsId = goodsId; } - + @Column(name ="GOODS_CODE",nullable=true,length=33) public java.lang.String getGoodsCode(){ return this.goodsCode; @@ -157,7 +159,7 @@ public class MvGoodsEntity implements java.io.Serializable { public void setGoodsName(java.lang.String goodsName){ this.goodsName = goodsName; } - + /** *方法: 取得java.lang.String *@return: java.lang.String 商品名称 @@ -174,7 +176,7 @@ public class MvGoodsEntity implements java.io.Serializable { public void setShpMingCheng(java.lang.String shpMingCheng){ this.shpMingCheng = shpMingCheng; } - + /** *方法: 取得java.lang.String *@return: java.lang.String shlDanWei @@ -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; + } } diff --git a/src/main/java/com/zzjee/wave/controller/WaveToDownController.java b/src/main/java/com/zzjee/wave/controller/WaveToDownController.java index f3854d1c..bf8d4b96 100644 --- a/src/main/java/com/zzjee/wave/controller/WaveToDownController.java +++ b/src/main/java/com/zzjee/wave/controller/WaveToDownController.java @@ -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) diff --git a/src/main/java/com/zzjee/wave/controller/WaveToFjController.java b/src/main/java/com/zzjee/wave/controller/WaveToFjController.java index 4938934d..c4f3bcac 100644 --- a/src/main/java/com/zzjee/wave/controller/WaveToFjController.java +++ b/src/main/java/com/zzjee/wave/controller/WaveToFjController.java @@ -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) diff --git a/src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java b/src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java index 734a3738..2aa882d5 100644 --- a/src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java +++ b/src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java @@ -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); diff --git a/src/main/java/com/zzjee/wm/controller/WmOmQmIController.java b/src/main/java/com/zzjee/wm/controller/WmOmQmIController.java index 1ee30a4e..6b7f0702 100644 --- a/src/main/java/com/zzjee/wm/controller/WmOmQmIController.java +++ b/src/main/java/com/zzjee/wm/controller/WmOmQmIController.java @@ -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); diff --git a/src/main/java/com/zzjee/wm/entity/WmImNoticeIEntity.java b/src/main/java/com/zzjee/wm/entity/WmImNoticeIEntity.java index ed13dc10..07c526b4 100644 --- a/src/main/java/com/zzjee/wm/entity/WmImNoticeIEntity.java +++ b/src/main/java/com/zzjee/wm/entity/WmImNoticeIEntity.java @@ -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; + } } diff --git a/src/main/java/com/zzjee/wm/entity/WmOmNoticeIEntity.java b/src/main/java/com/zzjee/wm/entity/WmOmNoticeIEntity.java index 52732c66..9e1e473c 100644 --- a/src/main/java/com/zzjee/wm/entity/WmOmNoticeIEntity.java +++ b/src/main/java/com/zzjee/wm/entity/WmOmNoticeIEntity.java @@ -17,12 +17,12 @@ import org.hibernate.annotations.GenericGenerator; import javax.persistence.SequenceGenerator; import org.jeecgframework.poi.excel.annotation.Excel; -/** +/** * @Title: Entity * @Description: 出货通知项目 * @author erzhongxmu * @date 2017-09-11 15:24:57 - * @version V1.0 + * @version V1.0 * */ @Entity @@ -35,25 +35,25 @@ public class WmOmNoticeIEntity implements java.io.Serializable { private java.lang.String createName; /**创建人登录名称*/ - + private java.lang.String createBy; /**创建日期*/ - + private java.util.Date createDate; /**更新人名称*/ - + private java.lang.String updateName; /**更新人登录名称*/ - + private java.lang.String updateBy; /**更新日期*/ - + private java.util.Date updateDate; /**所属部门*/ - + private java.lang.String sysOrgCode; /**所属公司*/ - + private java.lang.String sysCompanyCode; /**出货通知ID*/ @@ -80,11 +80,11 @@ public class WmOmNoticeIEntity implements java.io.Serializable { /**出货单位*/ @Excel(name="出货单位") private java.lang.String goodsUnit; - + @Excel(name="生产日期",format = "yyyy-MM-dd") private java.util.Date goodsProData; /**批次*/ - + private java.lang.String goodsBatch; /**出货仓位*/ @@ -93,7 +93,7 @@ public class WmOmNoticeIEntity implements java.io.Serializable { private java.lang.String goodsQuaok; /**预约出货时间*/ - + private java.lang.String delvData; /**客户*/ @@ -102,13 +102,13 @@ public class WmOmNoticeIEntity implements java.io.Serializable { private java.lang.String cusName; /**商品名称*/ - + private java.lang.String goodsText; /**波次号*/ - + private java.lang.String waveId; /**状态*/ - + private java.lang.String omSta; /**基本单位*/ @@ -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 @@ -129,7 +131,7 @@ public class WmOmNoticeIEntity implements java.io.Serializable { @Id @GeneratedValue(generator = "paymentableGenerator") @GenericGenerator(name = "paymentableGenerator", strategy = "uuid") - + @Column(name ="ID",nullable=false,length=36) public java.lang.String getId(){ return this.id; @@ -142,12 +144,12 @@ public class WmOmNoticeIEntity implements java.io.Serializable { public void setId(java.lang.String id){ this.id = id; } - + /** *方法: 取得java.lang.String *@return: java.lang.String 创建人名称 */ - + @Column(name ="CREATE_NAME",nullable=true,length=50) public java.lang.String getCreateName(){ return this.createName; @@ -160,12 +162,12 @@ public class WmOmNoticeIEntity implements java.io.Serializable { public void setCreateName(java.lang.String createName){ this.createName = createName; } - + /** *方法: 取得java.lang.String *@return: java.lang.String 创建人登录名称 */ - + @Column(name ="CREATE_BY",nullable=true,length=50) public java.lang.String getCreateBy(){ return this.createBy; @@ -178,12 +180,12 @@ public class WmOmNoticeIEntity implements java.io.Serializable { public void setCreateBy(java.lang.String createBy){ this.createBy = createBy; } - + /** *方法: 取得java.util.Date *@return: java.util.Date 创建日期 */ - + @Column(name ="CREATE_DATE",nullable=true) public java.util.Date getCreateDate(){ return this.createDate; @@ -196,12 +198,12 @@ public class WmOmNoticeIEntity implements java.io.Serializable { public void setCreateDate(java.util.Date createDate){ this.createDate = createDate; } - + /** *方法: 取得java.lang.String *@return: java.lang.String 更新人名称 */ - + @Column(name ="UPDATE_NAME",nullable=true,length=50) public java.lang.String getUpdateName(){ return this.updateName; @@ -214,12 +216,12 @@ public class WmOmNoticeIEntity implements java.io.Serializable { public void setUpdateName(java.lang.String updateName){ this.updateName = updateName; } - + /** *方法: 取得java.lang.String *@return: java.lang.String 更新人登录名称 */ - + @Column(name ="UPDATE_BY",nullable=true,length=50) public java.lang.String getUpdateBy(){ return this.updateBy; @@ -232,12 +234,12 @@ public class WmOmNoticeIEntity implements java.io.Serializable { public void setUpdateBy(java.lang.String updateBy){ this.updateBy = updateBy; } - + /** *方法: 取得java.util.Date *@return: java.util.Date 更新日期 */ - + @Column(name ="UPDATE_DATE",nullable=true) public java.util.Date getUpdateDate(){ return this.updateDate; @@ -250,12 +252,12 @@ public class WmOmNoticeIEntity implements java.io.Serializable { public void setUpdateDate(java.util.Date updateDate){ this.updateDate = updateDate; } - + /** *方法: 取得java.lang.String *@return: java.lang.String 所属部门 */ - + @Column(name ="SYS_ORG_CODE",nullable=true,length=50) public java.lang.String getSysOrgCode(){ return this.sysOrgCode; @@ -268,12 +270,12 @@ public class WmOmNoticeIEntity implements java.io.Serializable { public void setSysOrgCode(java.lang.String sysOrgCode){ this.sysOrgCode = sysOrgCode; } - + /** *方法: 取得java.lang.String *@return: java.lang.String 所属公司 */ - + @Column(name ="SYS_COMPANY_CODE",nullable=true,length=50) public java.lang.String getSysCompanyCode(){ return this.sysCompanyCode; @@ -286,12 +288,12 @@ public class WmOmNoticeIEntity implements java.io.Serializable { public void setSysCompanyCode(java.lang.String sysCompanyCode){ this.sysCompanyCode = sysCompanyCode; } - + /** *方法: 取得java.lang.String *@return: java.lang.String 出货通知ID */ - + @Column(name ="OM_NOTICE_ID",nullable=true,length=36) public java.lang.String getOmNoticeId(){ return this.omNoticeId; @@ -304,12 +306,12 @@ public class WmOmNoticeIEntity implements java.io.Serializable { public void setOmNoticeId(java.lang.String omNoticeId){ this.omNoticeId = omNoticeId; } - + /** *方法: 取得java.lang.String *@return: java.lang.String 出货商品 */ - + @Column(name ="GOODS_ID",nullable=true,length=36) public java.lang.String getGoodsId(){ return this.goodsId; @@ -322,12 +324,12 @@ public class WmOmNoticeIEntity implements java.io.Serializable { public void setGoodsId(java.lang.String goodsId){ this.goodsId = goodsId; } - + /** *方法: 取得java.lang.String *@return: java.lang.String 出货数量 */ - + @Column(name ="GOODS_QUA",nullable=true,length=32) public java.lang.String getGoodsQua(){ return this.goodsQua; @@ -340,12 +342,12 @@ public class WmOmNoticeIEntity implements java.io.Serializable { public void setGoodsQua(java.lang.String goodsQua){ this.goodsQua = goodsQua; } - + /** *方法: 取得java.lang.String *@return: java.lang.String 出货单位 */ - + @Column(name ="GOODS_UNIT",nullable=true,length=32) public java.lang.String getGoodsUnit(){ return this.goodsUnit; @@ -358,12 +360,12 @@ public class WmOmNoticeIEntity implements java.io.Serializable { public void setGoodsUnit(java.lang.String goodsUnit){ this.goodsUnit = goodsUnit; } - + /** *方法: 取得java.util.Date *@return: java.util.Date 生产日期 */ - + @Column(name ="GOODS_PRO_DATA",nullable=true) public java.util.Date getGoodsProData(){ return this.goodsProData; @@ -376,12 +378,12 @@ public class WmOmNoticeIEntity implements java.io.Serializable { public void setGoodsProData(java.util.Date goodsProData){ this.goodsProData = goodsProData; } - + /** *方法: 取得java.lang.String *@return: java.lang.String 批次 */ - + @Column(name ="GOODS_BATCH",nullable=true,length=32) public java.lang.String getGoodsBatch(){ return this.goodsBatch; @@ -394,12 +396,12 @@ public class WmOmNoticeIEntity implements java.io.Serializable { public void setGoodsBatch(java.lang.String goodsBatch){ this.goodsBatch = goodsBatch; } - + /** *方法: 取得java.lang.String *@return: java.lang.String 出货仓位 */ - + @Column(name ="BIN_OM",nullable=true,length=36) public java.lang.String getBinOm(){ return this.binOm; @@ -412,12 +414,12 @@ public class WmOmNoticeIEntity implements java.io.Serializable { public void setBinOm(java.lang.String binOm){ this.binOm = binOm; } - + /** *方法: 取得java.lang.String *@return: java.lang.String 已出货数量 */ - + @Column(name ="GOODS_QUAOK",nullable=true,length=32) public java.lang.String getGoodsQuaok(){ return this.goodsQuaok; @@ -430,12 +432,12 @@ public class WmOmNoticeIEntity implements java.io.Serializable { public void setGoodsQuaok(java.lang.String goodsQuaok){ this.goodsQuaok = goodsQuaok; } - + /** *方法: 取得java.lang.String *@return: java.lang.String 预约出货时间 */ - + @Column(name ="DELV_DATA",nullable=true,length=32) public java.lang.String getDelvData(){ return this.delvData; @@ -448,12 +450,12 @@ public class WmOmNoticeIEntity implements java.io.Serializable { public void setDelvData(java.lang.String delvData){ this.delvData = delvData; } - + /** *方法: 取得java.lang.String *@return: java.lang.String 客户 */ - + @Column(name ="CUS_CODE",nullable=true,length=32) public java.lang.String getCusCode(){ return this.cusCode; @@ -466,12 +468,12 @@ public class WmOmNoticeIEntity implements java.io.Serializable { public void setCusCode(java.lang.String cusCode){ this.cusCode = cusCode; } - + /** *方法: 取得java.lang.String *@return: java.lang.String 客户名称 */ - + @Column(name ="CUS_NAME",nullable=true,length=64) public java.lang.String getCusName(){ return this.cusName; @@ -484,12 +486,12 @@ public class WmOmNoticeIEntity implements java.io.Serializable { public void setCusName(java.lang.String cusName){ this.cusName = cusName; } - + /** *方法: 取得java.lang.String *@return: java.lang.String 商品名称 */ - + @Column(name ="GOODS_TEXT",nullable=true,length=45) public java.lang.String getGoodsText(){ return this.goodsText; @@ -502,12 +504,12 @@ public class WmOmNoticeIEntity implements java.io.Serializable { public void setGoodsText(java.lang.String goodsText){ this.goodsText = goodsText; } - + /** *方法: 取得java.lang.String *@return: java.lang.String 波次号 */ - + @Column(name ="WAVE_ID",nullable=true,length=45) public java.lang.String getWaveId(){ return this.waveId; @@ -520,12 +522,12 @@ public class WmOmNoticeIEntity implements java.io.Serializable { public void setWaveId(java.lang.String waveId){ this.waveId = waveId; } - + /** *方法: 取得java.lang.String *@return: java.lang.String 状态 */ - + @Column(name ="OM_STA",nullable=true,length=45) public java.lang.String getOmSta(){ return this.omSta; @@ -538,12 +540,12 @@ public class WmOmNoticeIEntity implements java.io.Serializable { public void setOmSta(java.lang.String omSta){ this.omSta = omSta; } - + /** *方法: 取得java.lang.String *@return: java.lang.String 基本单位 */ - + @Column(name ="BASE_UNIT",nullable=true,length=45) public java.lang.String getBaseUnit(){ return this.baseUnit; @@ -556,12 +558,12 @@ public class WmOmNoticeIEntity implements java.io.Serializable { public void setBaseUnit(java.lang.String baseUnit){ this.baseUnit = baseUnit; } - + /** *方法: 取得java.lang.String *@return: java.lang.String 基本单位数量 */ - + @Column(name ="BASE_GOODSCOUNT",nullable=true,length=45) public java.lang.String getBaseGoodscount(){ return this.baseGoodscount; @@ -574,12 +576,12 @@ public class WmOmNoticeIEntity implements java.io.Serializable { public void setBaseGoodscount(java.lang.String baseGoodscount){ this.baseGoodscount = baseGoodscount; } - + /** *方法: 取得java.lang.String *@return: java.lang.String 下架计划生成 */ - + @Column(name ="PLAN_STA",nullable=true,length=45) public java.lang.String getPlanSta(){ return this.planSta; @@ -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; + } } diff --git a/src/main/java/com/zzjee/wm/service/impl/WmImNoticeHServiceImpl.java b/src/main/java/com/zzjee/wm/service/impl/WmImNoticeHServiceImpl.java index e6ba9faa..23e3831e 100644 --- a/src/main/java/com/zzjee/wm/service/impl/WmImNoticeHServiceImpl.java +++ b/src/main/java/com/zzjee/wm/service/impl/WmImNoticeHServiceImpl.java @@ -33,26 +33,26 @@ import java.io.Serializable; @Service("wmImNoticeHService") @Transactional public class WmImNoticeHServiceImpl extends CommonServiceImpl implements WmImNoticeHServiceI { - + public void delete(T entity) { super.delete(entity); //执行删除操作配置的sql增强 this.doDelSql((WmImNoticeHEntity)entity); } - + public void addMain(WmImNoticeHEntity wmImNoticeH, List wmImNoticeIList){ //保存主信息 this.save(wmImNoticeH); - + /**保存-进货通知明细*/ for(WmImNoticeIEntity wmImNoticeI:wmImNoticeIList){ //外键设置 - MvGoodsEntity mvgoods = this.findUniqueByProperty(MvGoodsEntity.class, "goodsCode", wmImNoticeI.getGoodsCode()) ; + MvGoodsEntity mvgoods = this.findUniqueByProperty(MvGoodsEntity.class, "goodsCode", wmImNoticeI.getGoodsCode()) ; 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()))); @@ -78,7 +78,7 @@ public class WmImNoticeHServiceImpl extends CommonServiceImpl implements WmImNot } catch (Exception e) { // TODO: handle exception } - + try { // wmImNoticeI.setGoodsFvol(String.valueOf(Long.parseLong(mdgoods.getTiJiCm())*Long.parseLong(wmImNoticeI.getGoodsCount()))); wmImNoticeI.setGoodsWeight(String.valueOf(Double.parseDouble(mvgoods.getZhlKg())*Double.parseDouble(wmImNoticeI.getGoodsCount()))); @@ -87,7 +87,7 @@ public class WmImNoticeHServiceImpl extends CommonServiceImpl implements WmImNot } catch (Exception e) { // TODO: handle exception } - + } if("04".equals(wmImNoticeH.getOrderTypeCode())){//越库任务 wmImNoticeI.setGoodsQmCount("0"); @@ -133,20 +133,20 @@ public class WmImNoticeHServiceImpl extends CommonServiceImpl implements WmImNot wmImNoticeI.setBinPre("I"); } } - + wmImNoticeI.setImNoticeId(wmImNoticeH.getNoticeId()); wmImNoticeI.setImBeizhu(wmImNoticeH.getImBeizhu()); wmImNoticeI.setImCusCode(wmImNoticeH.getImCusCode()); this.save(wmImNoticeI); } - + } //执行新增操作配置的sql增强 this.doAddSql(wmImNoticeH); } - + public void updateMain(WmImNoticeHEntity wmImNoticeH, List wmImNoticeIList) { //保存主表信息 @@ -180,14 +180,14 @@ public class WmImNoticeHServiceImpl extends CommonServiceImpl implements WmImNot //如果数据库存在的明细，前台没有传递过来则是删除-进货通知明细 super.delete(oldE); } - + } //3.持久化新增的数据-进货通知明细 for(WmImNoticeIEntity wmImNoticeI:wmImNoticeIList){ if(oConvertUtils.isEmpty(wmImNoticeI.getId())){ //外键设置 MvGoodsEntity mvgoods = new MvGoodsEntity(); - mvgoods = this.findUniqueByProperty(MvGoodsEntity.class, "goodsCode", wmImNoticeI.getGoodsCode()) ; + mvgoods = this.findUniqueByProperty(MvGoodsEntity.class, "goodsCode", wmImNoticeI.getGoodsCode()) ; if(mvgoods!=null){ try { wmImNoticeI.setGoodsUnit(mvgoods.getShlDanWei()); @@ -231,7 +231,7 @@ public class WmImNoticeHServiceImpl extends CommonServiceImpl implements WmImNot this.doUpdateSql(wmImNoticeH); } - + public void delMain(WmImNoticeHEntity wmImNoticeH) { //删除主表信息 this.delete(wmImNoticeH); @@ -244,8 +244,8 @@ public class WmImNoticeHServiceImpl extends CommonServiceImpl implements WmImNot List wmImNoticeIOldList = this.findHql(hql0,id0); this.deleteAllEntitie(wmImNoticeIOldList); } - - + + /** * 默认按钮-sql增强-新增操作 * @return @@ -267,7 +267,7 @@ public class WmImNoticeHServiceImpl extends CommonServiceImpl implements WmImNot public boolean doDelSql(WmImNoticeHEntity t){ return true; } - + /** * 替换sql中的变量 * @param sql @@ -297,4 +297,4 @@ public class WmImNoticeHServiceImpl extends CommonServiceImpl implements WmImNot sql = sql.replace("#{UUID}",UUID.randomUUID().toString()); return sql; } -} \ No newline at end of file +} diff --git a/src/main/java/com/zzjee/wm/service/impl/WmOmNoticeHServiceImpl.java b/src/main/java/com/zzjee/wm/service/impl/WmOmNoticeHServiceImpl.java index 4860cbcd..feed4fc2 100644 --- a/src/main/java/com/zzjee/wm/service/impl/WmOmNoticeHServiceImpl.java +++ b/src/main/java/com/zzjee/wm/service/impl/WmOmNoticeHServiceImpl.java @@ -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());