diff --git a/src/main/java/com/zzjee/wave/controller/WaveToDownController.java b/src/main/java/com/zzjee/wave/controller/WaveToDownController.java index f6dd9122..f6c245b7 100644 --- a/src/main/java/com/zzjee/wave/controller/WaveToDownController.java +++ b/src/main/java/com/zzjee/wave/controller/WaveToDownController.java @@ -369,13 +369,9 @@ public class WaveToDownController extends BaseController { e.printStackTrace(); return new ResponseEntity(HttpStatus.NO_CONTENT); } - //按照Restful风格约定，创建指向新任务的url, 也可以直接返回id或对象. - String id = waveToDown.getId(); - URI uri = uriBuilder.path("/rest/waveToDownController/" + id).build().toUri(); - HttpHeaders headers = new HttpHeaders(); - headers.setLocation(uri); - return new ResponseEntity(headers, HttpStatus.CREATED); + + return new ResponseEntity(waveToDown, HttpStatus.OK); } @RequestMapping(value = "/{id}", method = RequestMethod.PUT, consumes = MediaType.APPLICATION_JSON_VALUE) diff --git a/src/main/java/com/zzjee/wave/controller/WaveToFjController.java b/src/main/java/com/zzjee/wave/controller/WaveToFjController.java index 7b420bbf..3ad49f3c 100644 --- a/src/main/java/com/zzjee/wave/controller/WaveToFjController.java +++ b/src/main/java/com/zzjee/wave/controller/WaveToFjController.java @@ -369,13 +369,9 @@ public class WaveToFjController extends BaseController { e.printStackTrace(); return new ResponseEntity(HttpStatus.NO_CONTENT); } - //按照Restful风格约定，创建指向新任务的url, 也可以直接返回id或对象. - String id = waveToFj.getId(); - URI uri = uriBuilder.path("/rest/waveToFjController/" + id).build().toUri(); - HttpHeaders headers = new HttpHeaders(); - headers.setLocation(uri); - return new ResponseEntity(headers, HttpStatus.CREATED); + + return new ResponseEntity(waveToFj, HttpStatus.OK); } @RequestMapping(value = "/{id}", method = RequestMethod.PUT, 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 b91e7e61..a74d09c9 100644 --- a/src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java +++ b/src/main/java/com/zzjee/wm/controller/WmOmNoticeHController.java @@ -20,6 +20,7 @@ import javax.validation.Validator; import com.zzjee.md.entity.MdGoodsEntity; import com.zzjee.tms.entity.TmsYwDingdanEntity; +import com.zzjee.wm.entity.*; import com.zzjee.wm.page.*; import com.zzjee.wmutil.dsc.dscUtil; import org.apache.commons.collections.CollectionUtils; @@ -82,13 +83,6 @@ import com.zzjee.api.ResultDO; import com.zzjee.md.entity.MdCusEntity; import com.zzjee.md.entity.MdCusOtherEntity; import com.zzjee.md.entity.MvGoodsEntity; -import com.zzjee.wm.entity.WmImNoticeHEntity; -import com.zzjee.wm.entity.WmInQmIEntity; -import com.zzjee.wm.entity.WmNoticeConfEntity; -import com.zzjee.wm.entity.WmOmNoticeHEntity; -import com.zzjee.wm.entity.WmOmNoticeIEntity; -import com.zzjee.wm.entity.WmOmQmIEntity; -import com.zzjee.wm.entity.WmPlatIoEntity; import com.zzjee.wm.service.WmOmNoticeHServiceI; import com.zzjee.wmutil.resResult; import com.zzjee.wmutil.sdresult; @@ -2444,6 +2438,40 @@ public class WmOmNoticeHController extends BaseController { } + + @RequestMapping(value = "/apicreatetms") + @ResponseBody + public ResponseEntity createtms(@RequestBody WmTmsNoticeHPage wmOmNoticeHPage ) { + //调用JSR303 Bean Validator进行校验，如果出错返回含400错误码及json格式的错误信息. + ResultDO D0 = new ResultDO(); + //保存 + List wmOmNoticeIList = wmOmNoticeHPage.getWmOmNoticeIList(); + String noticeid = wmUtil.getNextomNoticeId(wmOmNoticeHPage.getOrderTypeCode()); + wmOmNoticeHPage.setOmNoticeId(noticeid); + WmTmsNoticeHEntity wmOmNoticeH = new WmTmsNoticeHEntity(); + try{ + MyBeanUtils.copyBeanNotNull2Bean(wmOmNoticeHPage,wmOmNoticeH); + }catch(Exception e){ + logger.info(e.getMessage()); + } + List wmOmNoticeIListnew = new ArrayList<>(); + for(WmTmsNoticeIEntity t: wmOmNoticeIList){ + try{ + MdGoodsEntity md =systemService.findUniqueByProperty(MdGoodsEntity.class,"shpBianMa",t.getGoodsId()); + t.setCusCode(md.getSuoShuKeHu()); + }catch ( Exception e){ + + } + + wmOmNoticeIListnew.add(t); + } + wmOmNoticeHService.addMaintms(wmOmNoticeH, wmOmNoticeIListnew); + D0.setOK(true); + //按照Restful风格约定，创建指向新任务的url, 也可以直接返回id或对象. + return new ResponseEntity(D0, HttpStatus.OK); + + } + @RequestMapping(value = "/{id}", method = RequestMethod.PUT, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity update(@RequestBody WmOmNoticeHPage wmOmNoticeHPage) { //调用JSR303 Bean Validator进行校验，如果出错返回含400错误码及json格式的错误信息. diff --git a/src/main/java/com/zzjee/wm/entity/WmTmsNoticeHEntity.java b/src/main/java/com/zzjee/wm/entity/WmTmsNoticeHEntity.java new file mode 100644 index 00000000..8687a35e --- /dev/null +++ b/src/main/java/com/zzjee/wm/entity/WmTmsNoticeHEntity.java @@ -0,0 +1,586 @@ +package com.zzjee.wm.entity; + +import org.hibernate.annotations.GenericGenerator; +import org.jeecgframework.poi.excel.annotation.Excel; + +import javax.persistence.*; +import java.util.Date; + +/** + * @Title: Entity + * @Description: 出货通知抬头 + * @author erzhongxmu + * @date 2017-09-11 15:24:58 + * @version V1.0 + * + */ +@Entity +@Table(name = "tms_om_notice_h", schema = "") +@SuppressWarnings("serial") +public class WmTmsNoticeHEntity implements java.io.Serializable { + /**主键*/ + private String id; + /**创建人名称*/ + private String createName; + /**创建人登录名称*/ + + private String createBy; + /**创建日期*/ + + private Date createDate; + /**更新人名称*/ + + private String updateName; + /**更新人登录名称*/ + + private String updateBy; + /**更新日期*/ + + private Date updateDate; + /**所属部门*/ + private String readonly; + + private String wherecon; + + private String sysOrgCode; + /**所属公司*/ + private String orderTypeCode; + + private String sysCompanyCode; + /**客户*/ + @Excel(name="客户") + private String cusCode; + /**客户订单号*/ + @Excel(name="客户订单号") + private String imCusCode; + /**要求交货时间*/ + @Excel(name="要求交货时间",format = "yyyy-MM-dd") + private Date delvData; + /**收货人*/ + @Excel(name="收货人") + private String delvMember; + /**收货人电话*/ + @Excel(name="收货人电话") + private String delvMobile; + /**收货人地址*/ + @Excel(name="收货人地址") + private String delvAddr; + /**承运人*/ + @Excel(name="承运人") + private String reMember; + /**承运人电话*/ + @Excel(name="承运人电话") + private String reMobile; + /**承运人车号*/ + @Excel(name="承运人车号") + private String reCarno; + /**发货月台*/ + @Excel(name="发货月台") + private String omPlatNo; + /**备注*/ + @Excel(name="备注") + private String omBeizhu; + /**状态*/ + @Excel(name="状态") + private String omSta; + /**出货单号*/ + @Excel(name="出货单号") + private String omNoticeId; + /**附件*/ + + private String fuJian; + @Excel(name="三方客户编号") + + private String ocusCode; + @Excel(name="三方客户名称") + private String ocusName; + + private String printStatus; + private String piClass; + + private String piMaster; + + /** + *方法: 取得java.lang.String + *@return: java.lang.String 主键 + */ + @Id + @GeneratedValue(generator = "paymentableGenerator") + @GenericGenerator(name = "paymentableGenerator", strategy = "uuid") + + @Column(name ="ID",nullable=false,length=36) + public String getId(){ + return this.id; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 主键 + */ + public void setId(String id){ + this.id = id; + } + @Column(name ="ORDER_TYPE_CODE",nullable=true,length=32) + public String getOrderTypeCode(){ + return this.orderTypeCode; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 订单类型 + */ + public void setOrderTypeCode(String orderTypeCode){ + this.orderTypeCode = orderTypeCode; + } + /** + *方法: 取得java.lang.String + *@return: java.lang.String 创建人名称 + */ + + @Column(name ="CREATE_NAME",nullable=true,length=50) + public String getCreateName(){ + return this.createName; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 创建人名称 + */ + public void setCreateName(String createName){ + this.createName = createName; + } + + /** + *方法: 取得java.lang.String + *@return: java.lang.String 创建人登录名称 + */ + + @Column(name ="CREATE_BY",nullable=true,length=50) + public String getCreateBy(){ + return this.createBy; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 创建人登录名称 + */ + public void setCreateBy(String createBy){ + this.createBy = createBy; + } + + /** + *方法: 取得java.util.Date + *@return: java.util.Date 创建日期 + */ + + @Column(name ="CREATE_DATE",nullable=true) + public Date getCreateDate(){ + return this.createDate; + } + + /** + *方法: 设置java.util.Date + *@param: java.util.Date 创建日期 + */ + public void setCreateDate(Date createDate){ + this.createDate = createDate; + } + + /** + *方法: 取得java.lang.String + *@return: java.lang.String 更新人名称 + */ + + @Column(name ="UPDATE_NAME",nullable=true,length=50) + public String getUpdateName(){ + return this.updateName; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 更新人名称 + */ + public void setUpdateName(String updateName){ + this.updateName = updateName; + } + + /** + *方法: 取得java.lang.String + *@return: java.lang.String 更新人登录名称 + */ + + @Column(name ="UPDATE_BY",nullable=true,length=50) + public String getUpdateBy(){ + return this.updateBy; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 更新人登录名称 + */ + public void setUpdateBy(String updateBy){ + this.updateBy = updateBy; + } + + /** + *方法: 取得java.util.Date + *@return: java.util.Date 更新日期 + */ + + @Column(name ="UPDATE_DATE",nullable=true) + public Date getUpdateDate(){ + return this.updateDate; + } + + /** + *方法: 设置java.util.Date + *@param: java.util.Date 更新日期 + */ + public void setUpdateDate(Date updateDate){ + this.updateDate = updateDate; + } + + /** + *方法: 取得java.lang.String + *@return: java.lang.String 所属部门 + */ + + @Column(name ="SYS_ORG_CODE",nullable=true,length=50) + public String getSysOrgCode(){ + return this.sysOrgCode; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 所属部门 + */ + public void setSysOrgCode(String sysOrgCode){ + this.sysOrgCode = sysOrgCode; + } + + /** + *方法: 取得java.lang.String + *@return: java.lang.String 所属公司 + */ + + @Column(name ="SYS_COMPANY_CODE",nullable=true,length=50) + public String getSysCompanyCode(){ + return this.sysCompanyCode; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 所属公司 + */ + public void setSysCompanyCode(String sysCompanyCode){ + this.sysCompanyCode = sysCompanyCode; + } + + /** + *方法: 取得java.lang.String + *@return: java.lang.String 客户 + */ + + @Column(name ="CUS_CODE",nullable=true,length=32) + public String getCusCode(){ + return this.cusCode; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 客户 + */ + public void setCusCode(String cusCode){ + this.cusCode = cusCode; + } + + /** + *方法: 取得java.util.Date + *@return: java.util.Date 要求交货时间 + */ + + @Column(name ="DELV_DATA",nullable=true) + public Date getDelvData(){ + return this.delvData; + } + + /** + *方法: 设置java.util.Date + *@param: java.util.Date 要求交货时间 + */ + public void setDelvData(Date delvData){ + this.delvData = delvData; + } + + /** + *方法: 取得java.lang.String + *@return: java.lang.String 收货人 + */ + + @Column(name ="DELV_MEMBER",nullable=true,length=32) + public String getDelvMember(){ + return this.delvMember; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 收货人 + */ + public void setDelvMember(String delvMember){ + this.delvMember = delvMember; + } + + /** + *方法: 取得java.lang.String + *@return: java.lang.String 收货人电话 + */ + + @Column(name ="DELV_MOBILE",nullable=true,length=32) + public String getDelvMobile(){ + return this.delvMobile; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 收货人电话 + */ + public void setDelvMobile(String delvMobile){ + this.delvMobile = delvMobile; + } + + /** + *方法: 取得java.lang.String + *@return: java.lang.String 收货人地址 + */ + + @Column(name ="DELV_ADDR",nullable=true,length=32) + public String getDelvAddr(){ + return this.delvAddr; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 收货人地址 + */ + public void setDelvAddr(String delvAddr){ + this.delvAddr = delvAddr; + } + + /** + *方法: 取得java.lang.String + *@return: java.lang.String 承运人 + */ + + @Column(name ="RE_MEMBER",nullable=true,length=32) + public String getReMember(){ + return this.reMember; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 承运人 + */ + public void setReMember(String reMember){ + this.reMember = reMember; + } + + /** + *方法: 取得java.lang.String + *@return: java.lang.String 承运人电话 + */ + + @Column(name ="RE_MOBILE",nullable=true,length=32) + public String getReMobile(){ + return this.reMobile; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 承运人电话 + */ + public void setReMobile(String reMobile){ + this.reMobile = reMobile; + } + + /** + *方法: 取得java.lang.String + *@return: java.lang.String 承运人车号 + */ + + @Column(name ="RE_CARNO",nullable=true,length=32) + public String getReCarno(){ + return this.reCarno; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 承运人车号 + */ + public void setReCarno(String reCarno){ + this.reCarno = reCarno; + } + + /** + *方法: 取得java.lang.String + *@return: java.lang.String 发货月台 + */ + + @Column(name ="OM_PLAT_NO",nullable=true,length=32) + public String getOmPlatNo(){ + return this.omPlatNo; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 发货月台 + */ + public void setOmPlatNo(String omPlatNo){ + this.omPlatNo = omPlatNo; + } + + /** + *方法: 取得java.lang.String + *@return: java.lang.String 备注 + */ + + @Column(name ="OM_BEIZHU",nullable=true,length=32) + public String getOmBeizhu(){ + return this.omBeizhu; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 备注 + */ + public void setOmBeizhu(String omBeizhu){ + this.omBeizhu = omBeizhu; + } + + /** + *方法: 取得java.lang.String + *@return: java.lang.String 状态 + */ + + @Column(name ="OM_STA",nullable=true,length=32) + public String getOmSta(){ + return this.omSta; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 状态 + */ + public void setOmSta(String omSta){ + this.omSta = omSta; + } + + /** + *方法: 取得java.lang.String + *@return: java.lang.String 出货单号 + */ + + @Column(name ="OM_NOTICE_ID",nullable=true,length=32) + public String getOmNoticeId(){ + return this.omNoticeId; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 出货单号 + */ + public void setOmNoticeId(String omNoticeId){ + this.omNoticeId = omNoticeId; + } + + /** + *方法: 取得java.lang.String + *@return: java.lang.String 附件 + */ + + @Column(name ="FU_JIAN",nullable=true,length=128) + public String getFuJian(){ + return this.fuJian; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 附件 + */ + public void setFuJian(String fuJian){ + this.fuJian = fuJian; + } + @Column(name ="READ_ONLY",nullable=true,length=32) + public String getReadonly() { + return readonly; + } + + public void setReadonly(String readonly) { + this.readonly = readonly; + } + @Column(name ="WHERE_CON",nullable=true,length=32) + public String getWherecon() { + return wherecon; + } + + public void setWherecon(String wherecon) { + this.wherecon = wherecon; + } + @Column(name ="OCUS_CODE",nullable=true,length=32) + public String getOcusCode() { + return ocusCode; + } + + public void setOcusCode(String ocusCode) { + this.ocusCode = ocusCode; + } + @Column(name ="OCUS_NAME",nullable=true,length=32) + public String getOcusName() { + return ocusName; + } + + public void setOcusName(String ocusName) { + this.ocusName = ocusName; + } + @Column(name ="IM_CUS_CODE",nullable=true,length=32) + public String getImCusCode(){ + return this.imCusCode; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 打印状态 + */ + public void setImCusCode(String imCusCode){ + this.imCusCode = imCusCode; + } + + @Column(name ="PRINT_STATUS",nullable=true,length=32) + public String getPrintStatus(){ + return this.printStatus; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 打印状态 + */ + public void setPrintStatus(String printStatus){ + this.printStatus = printStatus; + } + + @Column(name ="PI_CLASS",nullable=true,length=32) + public String getPiClass() { + return piClass; + } + + public void setPiClass(String piClass) { + this.piClass = piClass; + } + @Column(name ="PI_MASTER",nullable=true,length=32) + public String getPiMaster() { + return piMaster; + } + + public void setPiMaster(String piMaster) { + this.piMaster = piMaster; + } +} diff --git a/src/main/java/com/zzjee/wm/entity/WmTmsNoticeIEntity.java b/src/main/java/com/zzjee/wm/entity/WmTmsNoticeIEntity.java new file mode 100644 index 00000000..7e04ac58 --- /dev/null +++ b/src/main/java/com/zzjee/wm/entity/WmTmsNoticeIEntity.java @@ -0,0 +1,658 @@ +package com.zzjee.wm.entity; + +import org.hibernate.annotations.GenericGenerator; +import org.jeecgframework.poi.excel.annotation.Excel; + +import javax.persistence.*; +import java.util.Date; + +/** + * @Title: Entity + * @Description: 出货通知项目 + * @author erzhongxmu + * @date 2017-09-11 15:24:57 + * @version V1.0 + * + */ +@Entity +@Table(name = "tms_om_notice_i", schema = "") +@SuppressWarnings("serial") +public class WmTmsNoticeIEntity implements java.io.Serializable { + /**主键*/ + private String id; + /**创建人名称*/ + + private String createName; + /**创建人登录名称*/ + + private String createBy; + /**创建日期*/ + + private Date createDate; + /**更新人名称*/ + + private String updateName; + /**更新人登录名称*/ + + private String updateBy; + /**更新日期*/ + + private Date updateDate; + /**所属部门*/ + + private String sysOrgCode; + /**所属公司*/ + + private String sysCompanyCode; + /**出货通知ID*/ + + private String omNoticeId; + + /**客户订单号*/ + @Excel(name="客户订单号") + private String imCusCode; + @Excel(name="备注") + private String omBeizhu; + + /**出货商品*/ + @Excel(name="出货商品") + private String goodsId; + + @Excel(name="商品名称") + private String goodsName; + // @Excel(name="其他系统ID") + private String otherId; + + /**出货数量*/ + @Excel(name="出货数量") + private String goodsQua; + /**出货单位*/ + @Excel(name="出货单位") + private String goodsUnit; + + @Excel(name="生产日期",format = "yyyy-MM-dd") + private Date goodsProData; + /**批次*/ + + private String goodsBatch; + /**出货仓位*/ + + private String binOm; + /**已出货数量*/ + + private String goodsQuaok; + /**预约出货时间*/ + + private String delvData; + /**客户*/ + + private String cusCode; + /**客户名称*/ + + private String cusName; + /**商品名称*/ + + private String goodsText; + /**波次号*/ + + private String waveId; + /**状态*/ + + private String omSta; + /**基本单位*/ + + private String baseUnit; + /**基本单位数量*/ + + private String baseGoodscount; + /**下架计划生成*/ + + private String planSta; + private String binId; + + + /** + *方法: 取得java.lang.String + *@return: java.lang.String 主键 + */ + @Id + @GeneratedValue(generator = "paymentableGenerator") + @GenericGenerator(name = "paymentableGenerator", strategy = "uuid") + + @Column(name ="ID",nullable=false,length=36) + public String getId(){ + return this.id; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 主键 + */ + public void setId(String id){ + this.id = id; + } + + /** + *方法: 取得java.lang.String + *@return: java.lang.String 创建人名称 + */ + + @Column(name ="CREATE_NAME",nullable=true,length=50) + public String getCreateName(){ + return this.createName; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 创建人名称 + */ + public void setCreateName(String createName){ + this.createName = createName; + } + + /** + *方法: 取得java.lang.String + *@return: java.lang.String 创建人登录名称 + */ + + @Column(name ="CREATE_BY",nullable=true,length=50) + public String getCreateBy(){ + return this.createBy; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 创建人登录名称 + */ + public void setCreateBy(String createBy){ + this.createBy = createBy; + } + + /** + *方法: 取得java.util.Date + *@return: java.util.Date 创建日期 + */ + + @Column(name ="CREATE_DATE",nullable=true) + public Date getCreateDate(){ + return this.createDate; + } + + /** + *方法: 设置java.util.Date + *@param: java.util.Date 创建日期 + */ + public void setCreateDate(Date createDate){ + this.createDate = createDate; + } + + /** + *方法: 取得java.lang.String + *@return: java.lang.String 更新人名称 + */ + + @Column(name ="UPDATE_NAME",nullable=true,length=50) + public String getUpdateName(){ + return this.updateName; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 更新人名称 + */ + public void setUpdateName(String updateName){ + this.updateName = updateName; + } + + /** + *方法: 取得java.lang.String + *@return: java.lang.String 更新人登录名称 + */ + + @Column(name ="UPDATE_BY",nullable=true,length=50) + public String getUpdateBy(){ + return this.updateBy; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 更新人登录名称 + */ + public void setUpdateBy(String updateBy){ + this.updateBy = updateBy; + } + + /** + *方法: 取得java.util.Date + *@return: java.util.Date 更新日期 + */ + + @Column(name ="UPDATE_DATE",nullable=true) + public Date getUpdateDate(){ + return this.updateDate; + } + + /** + *方法: 设置java.util.Date + *@param: java.util.Date 更新日期 + */ + public void setUpdateDate(Date updateDate){ + this.updateDate = updateDate; + } + + /** + *方法: 取得java.lang.String + *@return: java.lang.String 所属部门 + */ + + @Column(name ="SYS_ORG_CODE",nullable=true,length=50) + public String getSysOrgCode(){ + return this.sysOrgCode; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 所属部门 + */ + public void setSysOrgCode(String sysOrgCode){ + this.sysOrgCode = sysOrgCode; + } + + /** + *方法: 取得java.lang.String + *@return: java.lang.String 所属公司 + */ + + @Column(name ="SYS_COMPANY_CODE",nullable=true,length=50) + public String getSysCompanyCode(){ + return this.sysCompanyCode; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 所属公司 + */ + public void setSysCompanyCode(String sysCompanyCode){ + this.sysCompanyCode = sysCompanyCode; + } + + /** + *方法: 取得java.lang.String + *@return: java.lang.String 出货通知ID + */ + + @Column(name ="OM_NOTICE_ID",nullable=true,length=36) + public String getOmNoticeId(){ + return this.omNoticeId; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 出货通知ID + */ + public void setOmNoticeId(String omNoticeId){ + this.omNoticeId = omNoticeId; + } + + /** + *方法: 取得java.lang.String + *@return: java.lang.String 出货商品 + */ + + @Column(name ="GOODS_ID",nullable=true,length=36) + public String getGoodsId(){ + return this.goodsId; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 出货商品 + */ + public void setGoodsId(String goodsId){ + this.goodsId = goodsId; + } + + /** + *方法: 取得java.lang.String + *@return: java.lang.String 出货数量 + */ + + @Column(name ="GOODS_QUA",nullable=true,length=32) + public String getGoodsQua(){ + return this.goodsQua; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 出货数量 + */ + public void setGoodsQua(String goodsQua){ + this.goodsQua = goodsQua; + } + + /** + *方法: 取得java.lang.String + *@return: java.lang.String 出货单位 + */ + + @Column(name ="GOODS_UNIT",nullable=true,length=32) + public String getGoodsUnit(){ + return this.goodsUnit; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 出货单位 + */ + public void setGoodsUnit(String goodsUnit){ + this.goodsUnit = goodsUnit; + } + + /** + *方法: 取得java.util.Date + *@return: java.util.Date 生产日期 + */ + + @Column(name ="GOODS_PRO_DATA",nullable=true) + public Date getGoodsProData(){ + return this.goodsProData; + } + + /** + *方法: 设置java.util.Date + *@param: java.util.Date 生产日期 + */ + public void setGoodsProData(Date goodsProData){ + this.goodsProData = goodsProData; + } + + /** + *方法: 取得java.lang.String + *@return: java.lang.String 批次 + */ + + @Column(name ="GOODS_BATCH",nullable=true,length=32) + public String getGoodsBatch(){ + return this.goodsBatch; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 批次 + */ + public void setGoodsBatch(String goodsBatch){ + this.goodsBatch = goodsBatch; + } + + /** + *方法: 取得java.lang.String + *@return: java.lang.String 出货仓位 + */ + + @Column(name ="BIN_OM",nullable=true,length=36) + public String getBinOm(){ + return this.binOm; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 出货仓位 + */ + public void setBinOm(String binOm){ + this.binOm = binOm; + } + + /** + *方法: 取得java.lang.String + *@return: java.lang.String 已出货数量 + */ + + @Column(name ="GOODS_QUAOK",nullable=true,length=32) + public String getGoodsQuaok(){ + return this.goodsQuaok; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 已出货数量 + */ + public void setGoodsQuaok(String goodsQuaok){ + this.goodsQuaok = goodsQuaok; + } + + /** + *方法: 取得java.lang.String + *@return: java.lang.String 预约出货时间 + */ + + @Column(name ="DELV_DATA",nullable=true,length=32) + public String getDelvData(){ + return this.delvData; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 预约出货时间 + */ + public void setDelvData(String delvData){ + this.delvData = delvData; + } + + /** + *方法: 取得java.lang.String + *@return: java.lang.String 客户 + */ + + @Column(name ="CUS_CODE",nullable=true,length=32) + public String getCusCode(){ + return this.cusCode; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 客户 + */ + public void setCusCode(String cusCode){ + this.cusCode = cusCode; + } + + /** + *方法: 取得java.lang.String + *@return: java.lang.String 客户名称 + */ + + @Column(name ="CUS_NAME",nullable=true,length=64) + public String getCusName(){ + return this.cusName; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 客户名称 + */ + public void setCusName(String cusName){ + this.cusName = cusName; + } + + /** + *方法: 取得java.lang.String + *@return: java.lang.String 商品名称 + */ + + @Column(name ="GOODS_TEXT",nullable=true,length=45) + public String getGoodsText(){ + return this.goodsText; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 商品名称 + */ + public void setGoodsText(String goodsText){ + this.goodsText = goodsText; + } + + /** + *方法: 取得java.lang.String + *@return: java.lang.String 波次号 + */ + + @Column(name ="WAVE_ID",nullable=true,length=45) + public String getWaveId(){ + return this.waveId; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 波次号 + */ + public void setWaveId(String waveId){ + this.waveId = waveId; + } + + /** + *方法: 取得java.lang.String + *@return: java.lang.String 状态 + */ + + @Column(name ="OM_STA",nullable=true,length=45) + public String getOmSta(){ + return this.omSta; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 状态 + */ + public void setOmSta(String omSta){ + this.omSta = omSta; + } + + /** + *方法: 取得java.lang.String + *@return: java.lang.String 基本单位 + */ + + @Column(name ="BASE_UNIT",nullable=true,length=45) + public String getBaseUnit(){ + return this.baseUnit; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 基本单位 + */ + public void setBaseUnit(String baseUnit){ + this.baseUnit = baseUnit; + } + + /** + *方法: 取得java.lang.String + *@return: java.lang.String 基本单位数量 + */ + + @Column(name ="BASE_GOODSCOUNT",nullable=true,length=45) + public String getBaseGoodscount(){ + return this.baseGoodscount; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 基本单位数量 + */ + public void setBaseGoodscount(String baseGoodscount){ + this.baseGoodscount = baseGoodscount; + } + + /** + *方法: 取得java.lang.String + *@return: java.lang.String 下架计划生成 + */ + + @Column(name ="PLAN_STA",nullable=true,length=45) + public String getPlanSta(){ + return this.planSta; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 下架计划生成 + */ + public void setPlanSta(String planSta){ + this.planSta = planSta; + } + /** + *方法: 取得java.lang.String + *@return: java.lang.String 商品名称 + */ + @Column(name ="GOODS_NAME",nullable=true,length=45) + public String getGoodsName(){ + return this.goodsName; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 商品名称 + */ + public void setGoodsName(String goodsName){ + this.goodsName = goodsName; + } + + + /** + *方法: 取得java.lang.String + *@return: java.lang.String 其他ID + */ + @Column(name ="OTHER_ID",nullable=true,length=45) + public String getOtherId(){ + return this.otherId; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 其他ID + */ + public void setOtherId(String otherId){ + this.otherId = otherId; + } + + @Column(name ="BIN_ID",nullable=true,length=45) + public String getBinId() { + return binId; + } + + public void setBinId(String binId) { + this.binId = binId; + } + + + @Column(name ="OM_BEI_ZHU",nullable=true,length=32) + public String getOmBeizhu(){ + return this.omBeizhu; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 备注 + */ + public void setOmBeizhu(String omBeizhu){ + this.omBeizhu = omBeizhu; + } + + + @Column(name ="IM_CUS_CODE",nullable=true,length=32) + public String getImCusCode(){ + return this.imCusCode; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 客户订单号 + */ + public void setImCusCode(String imCusCode){ + this.imCusCode = imCusCode; + } + + + +} diff --git a/src/main/java/com/zzjee/wm/page/WmTmsNoticeHPage.java b/src/main/java/com/zzjee/wm/page/WmTmsNoticeHPage.java new file mode 100644 index 00000000..6a8736f2 --- /dev/null +++ b/src/main/java/com/zzjee/wm/page/WmTmsNoticeHPage.java @@ -0,0 +1,511 @@ + +package com.zzjee.wm.page; + +import com.zzjee.tms.entity.TmsYwDingdanEntity; +import com.zzjee.wm.entity.WmOmNoticeIEntity; +import com.zzjee.wm.entity.WmTmsNoticeIEntity; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * @Title: Entity + * @Description: 出货通知抬头 + * @author erzhongxmu + * @date 2017-09-11 15:24:58 + * @version V1.0 + * + */ +public class WmTmsNoticeHPage implements java.io.Serializable { + /**主键*/ + private String id; + /**创建人名称*/ + + private String createName; + /**创建人登录名称*/ + + private String createBy; + /**创建日期*/ + + private Date createDate; + /**更新人名称*/ + + private String updateName; + /**更新人登录名称*/ + + private String updateBy; + /**更新日期*/ + + private Date updateDate; + /**所属部门*/ + private String readonly; + private String orderTypeCode; + + private String wherecon; + private String sysOrgCode; + /**所属公司*/ + + private String sysCompanyCode; + /**客户*/ + private String cusCode; + /**要求交货时间*/ + private Date delvData; + /**收货人*/ + private String delvMember; + /**收货人电话*/ + private String delvMobile; + /**收货人地址*/ + private String delvAddr; + /**承运人*/ + private String reMember; + /**承运人电话*/ + private String reMobile; + /**承运人车号*/ + private String reCarno; + /**发货月台*/ + private String omPlatNo; + /**备注*/ + private String omBeizhu; + /**状态*/ + private String omSta; + /**出货单号*/ + private String omNoticeId; + /**附件*/ + + private String fuJian; + + private String ocusCode; + + private String ocusName; + private String imCusCode; + private String printStatus; + private String piClass; + + private String piMaster; + /** + *方法: 取得java.lang.String + *@return: java.lang.String 主键 + */ + public String getId(){ + return this.id; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 主键 + */ + public void setId(String id){ + this.id = id; + } + /** + *方法: 取得java.lang.String + *@return: java.lang.String 创建人名称 + */ + public String getCreateName(){ + return this.createName; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 创建人名称 + */ + public void setCreateName(String createName){ + this.createName = createName; + } + /** + *方法: 取得java.lang.String + *@return: java.lang.String 创建人登录名称 + */ + public String getCreateBy(){ + return this.createBy; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 创建人登录名称 + */ + public void setCreateBy(String createBy){ + this.createBy = createBy; + } + /** + *方法: 取得java.util.Date + *@return: java.util.Date 创建日期 + */ + public Date getCreateDate(){ + return this.createDate; + } + + /** + *方法: 设置java.util.Date + *@param: java.util.Date 创建日期 + */ + public void setCreateDate(Date createDate){ + this.createDate = createDate; + } + /** + *方法: 取得java.lang.String + *@return: java.lang.String 更新人名称 + */ + public String getUpdateName(){ + return this.updateName; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 更新人名称 + */ + public void setUpdateName(String updateName){ + this.updateName = updateName; + } + /** + *方法: 取得java.lang.String + *@return: java.lang.String 更新人登录名称 + */ + public String getUpdateBy(){ + return this.updateBy; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 更新人登录名称 + */ + public void setUpdateBy(String updateBy){ + this.updateBy = updateBy; + } + /** + *方法: 取得java.util.Date + *@return: java.util.Date 更新日期 + */ + public Date getUpdateDate(){ + return this.updateDate; + } + + /** + *方法: 设置java.util.Date + *@param: java.util.Date 更新日期 + */ + public void setUpdateDate(Date updateDate){ + this.updateDate = updateDate; + } + /** + *方法: 取得java.lang.String + *@return: java.lang.String 所属部门 + */ + public String getSysOrgCode(){ + return this.sysOrgCode; + } + public String getOrderTypeCode(){ + return this.orderTypeCode; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 订单类型 + */ + public void setOrderTypeCode(String orderTypeCode){ + this.orderTypeCode = orderTypeCode; + } + /** + *方法: 设置java.lang.String + *@param: java.lang.String 所属部门 + */ + public void setSysOrgCode(String sysOrgCode){ + this.sysOrgCode = sysOrgCode; + } + /** + *方法: 取得java.lang.String + *@return: java.lang.String 所属公司 + */ + public String getSysCompanyCode(){ + return this.sysCompanyCode; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 所属公司 + */ + public void setSysCompanyCode(String sysCompanyCode){ + this.sysCompanyCode = sysCompanyCode; + } + /** + *方法: 取得java.lang.String + *@return: java.lang.String 客户 + */ + public String getCusCode(){ + return this.cusCode; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 客户 + */ + public void setCusCode(String cusCode){ + this.cusCode = cusCode; + } + /** + *方法: 取得java.util.Date + *@return: java.util.Date 要求交货时间 + */ + public Date getDelvData(){ + return this.delvData; + } + + /** + *方法: 设置java.util.Date + *@param: java.util.Date 要求交货时间 + */ + public void setDelvData(Date delvData){ + this.delvData = delvData; + } + /** + *方法: 取得java.lang.String + *@return: java.lang.String 收货人 + */ + public String getDelvMember(){ + return this.delvMember; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 收货人 + */ + public void setDelvMember(String delvMember){ + this.delvMember = delvMember; + } + /** + *方法: 取得java.lang.String + *@return: java.lang.String 收货人电话 + */ + public String getDelvMobile(){ + return this.delvMobile; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 收货人电话 + */ + public void setDelvMobile(String delvMobile){ + this.delvMobile = delvMobile; + } + /** + *方法: 取得java.lang.String + *@return: java.lang.String 收货人地址 + */ + public String getDelvAddr(){ + return this.delvAddr; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 收货人地址 + */ + public void setDelvAddr(String delvAddr){ + this.delvAddr = delvAddr; + } + /** + *方法: 取得java.lang.String + *@return: java.lang.String 承运人 + */ + public String getReMember(){ + return this.reMember; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 承运人 + */ + public void setReMember(String reMember){ + this.reMember = reMember; + } + /** + *方法: 取得java.lang.String + *@return: java.lang.String 承运人电话 + */ + public String getReMobile(){ + return this.reMobile; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 承运人电话 + */ + public void setReMobile(String reMobile){ + this.reMobile = reMobile; + } + /** + *方法: 取得java.lang.String + *@return: java.lang.String 承运人车号 + */ + public String getReCarno(){ + return this.reCarno; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 承运人车号 + */ + public void setReCarno(String reCarno){ + this.reCarno = reCarno; + } + /** + *方法: 取得java.lang.String + *@return: java.lang.String 发货月台 + */ + public String getOmPlatNo(){ + return this.omPlatNo; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 发货月台 + */ + public void setOmPlatNo(String omPlatNo){ + this.omPlatNo = omPlatNo; + } + /** + *方法: 取得java.lang.String + *@return: java.lang.String 备注 + */ + public String getOmBeizhu(){ + return this.omBeizhu; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 备注 + */ + public void setOmBeizhu(String omBeizhu){ + this.omBeizhu = omBeizhu; + } + /** + *方法: 取得java.lang.String + *@return: java.lang.String 状态 + */ + public String getOmSta(){ + return this.omSta; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 状态 + */ + public void setOmSta(String omSta){ + this.omSta = omSta; + } + /** + *方法: 取得java.lang.String + *@return: java.lang.String 出货单号 + */ + public String getOmNoticeId(){ + return this.omNoticeId; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 出货单号 + */ + public void setOmNoticeId(String omNoticeId){ + this.omNoticeId = omNoticeId; + } + /** + *方法: 取得java.lang.String + *@return: java.lang.String 附件 + */ + public String getFuJian(){ + return this.fuJian; + } + + /** + *方法: 设置java.lang.String + *@param: java.lang.String 附件 + */ + public void setFuJian(String fuJian){ + this.fuJian = fuJian; + } + + public String getReadonly() { + return readonly; + } + + public void setReadonly(String readonly) { + this.readonly = readonly; + } + + public String getWherecon() { + return wherecon; + } + + public void setWherecon(String wherecon) { + this.wherecon = wherecon; + } + + public String getOcusCode() { + return ocusCode; + } + + public void setOcusCode(String ocusCode) { + this.ocusCode = ocusCode; + } + + public String getOcusName() { + return ocusName; + } + + public void setOcusName(String ocusName) { + this.ocusName = ocusName; + } + + public String getImCusCode() { + return imCusCode; + } + + public void setImCusCode(String imCusCode) { + this.imCusCode = imCusCode; + } + + public String getPrintStatus() { + return printStatus; + } + + public void setPrintStatus(String printStatus) { + this.printStatus = printStatus; + } + + public String getPiClass() { + return piClass; + } + + public void setPiClass(String piClass) { + this.piClass = piClass; + } + + public String getPiMaster() { + return piMaster; + } + + public void setPiMaster(String piMaster) { + this.piMaster = piMaster; + } + + /**保存-出货通知项目*/ + private List wmOmNoticeIList = new ArrayList(); + public List getWmOmNoticeIList() { + return wmOmNoticeIList; + } + public void setWmOmNoticeIList(List wmOmNoticeIList) { + this.wmOmNoticeIList = wmOmNoticeIList; + } + + /**保存-出货通知项目*/ + private List wmOmtmsIList = new ArrayList(); + + + public List getWmOmtmsIList() { + return wmOmtmsIList; + } + + public void setWmOmtmsIList(List wmOmtmsIList) { + this.wmOmtmsIList = wmOmtmsIList; + } +} diff --git a/src/main/java/com/zzjee/wm/service/WmOmNoticeHServiceI.java b/src/main/java/com/zzjee/wm/service/WmOmNoticeHServiceI.java index c9869d2a..b77816f3 100644 --- a/src/main/java/com/zzjee/wm/service/WmOmNoticeHServiceI.java +++ b/src/main/java/com/zzjee/wm/service/WmOmNoticeHServiceI.java @@ -4,6 +4,9 @@ import com.zzjee.wm.entity.WmOmNoticeHEntity; import com.zzjee.wm.entity.WmOmNoticeIEntity; import java.util.List; + +import com.zzjee.wm.entity.WmTmsNoticeHEntity; +import com.zzjee.wm.entity.WmTmsNoticeIEntity; import org.jeecgframework.core.common.service.CommonService; import java.io.Serializable; @@ -16,6 +19,8 @@ public interface WmOmNoticeHServiceI extends CommonService{ */ public void addMain(WmOmNoticeHEntity wmOmNoticeH, List wmOmNoticeIList) ; + public void addMaintms(WmTmsNoticeHEntity wmOmNoticeH, + List wmOmNoticeIList) ; /** * 修改一对多 * 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 8d17b940..880e9914 100644 --- a/src/main/java/com/zzjee/wm/service/impl/WmOmNoticeHServiceImpl.java +++ b/src/main/java/com/zzjee/wm/service/impl/WmOmNoticeHServiceImpl.java @@ -2,6 +2,8 @@ package com.zzjee.wm.service.impl; import com.zzjee.md.entity.MdCusEntity; import com.zzjee.md.entity.MvGoodsEntity; import com.zzjee.tms.entity.TmsYwDingdanEntity; +import com.zzjee.wm.entity.WmTmsNoticeHEntity; +import com.zzjee.wm.entity.WmTmsNoticeIEntity; import com.zzjee.wm.service.WmOmNoticeHServiceI; import org.jeecgframework.core.common.service.impl.CommonServiceImpl; @@ -118,6 +120,59 @@ public class WmOmNoticeHServiceImpl extends CommonServiceImpl implements WmOmNot //执行新增操作配置的sql增强 this.doAddSql(wmOmNoticeH); } + public void addMaintms(WmTmsNoticeHEntity wmOmNoticeH, + List wmOmNoticeIList){ + //保存主信息 + this.save(wmOmNoticeH); + Double jishu = 0.00; + Double tiji=0.00; + Double zhongl = 0.00; + Double chang = 0.00; + Double kuan = 0.00; + Double gao = 0.00; + String huowu = ""; + /**保存-出货商品明细*/ + for(WmTmsNoticeIEntity wmOmNoticeI:wmOmNoticeIList){ + //外键设置 + try{ + MvGoodsEntity mvgoods = this.findUniqueByProperty(MvGoodsEntity.class, "goodsCode", wmOmNoticeI.getGoodsId()) ; + if(mvgoods!=null){ + huowu=huowu+mvgoods.getGoodsName(); + wmOmNoticeI.setGoodsName(mvgoods.getGoodsName()); + try{ + wmOmNoticeI.setBaseUnit(mvgoods.getBaseunit()); + wmOmNoticeI.setGoodsUnit(mvgoods.getShlDanWei()); + if(!mvgoods.getBaseunit().equals(mvgoods.getShlDanWei())){ + wmOmNoticeI.setBaseGoodscount(String.valueOf(Double.parseDouble(mvgoods.getChlShl())*Double.parseDouble(wmOmNoticeI.getGoodsQua()))); + }else{ + wmOmNoticeI.setBaseGoodscount(wmOmNoticeI.getGoodsQua()); + } + try{ + tiji= tiji+ Double.parseDouble(wmOmNoticeI.getBaseGoodscount())*Double.parseDouble(mvgoods.getTiJiCm()); + zhongl= zhongl+ Double.parseDouble(wmOmNoticeI.getBaseGoodscount())*Double.parseDouble(mvgoods.getZhlKg()); +// chang= chang+ Double.parseDouble(wmOmNoticeI.getBaseGoodscount())*Double.parseDouble(mvgoods.get()); +// kuan= kuan+ Double.parseDouble(wmOmNoticeI.getBaseGoodscount())*Double.parseDouble(mvgoods.getZhlKg()); +// gao= gao+ Double.parseDouble(wmOmNoticeI.getBaseGoodscount())*Double.parseDouble(mvgoods.getZhlKg()); + + jishu = jishu + Double.parseDouble(wmOmNoticeI.getBaseGoodscount()); + }catch (Exception e){ + } + }catch (Exception e){ + + } + } + }catch (Exception e){ + } + wmOmNoticeI.setCusCode(wmOmNoticeH.getCusCode()); + wmOmNoticeI.setPlanSta("N"); + wmOmNoticeI.setGoodsQuaok("0"); + wmOmNoticeI.setOmNoticeId(wmOmNoticeH.getOmNoticeId()); + wmOmNoticeI.setImCusCode(wmOmNoticeH.getImCusCode()); + wmOmNoticeI.setOmBeizhu(wmOmNoticeH.getOmBeizhu()); + this.save(wmOmNoticeI); + } + + } public void updateMain(WmOmNoticeHEntity wmOmNoticeH,