领料单头上的仓库、库区、库位名称显示修复；条码功能修改。
This commit is contained in:
JinLu.Yin
parent
ec0b393b9b
commit
d22518b21c
@ -5,11 +5,10 @@ import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import com.ktg.common.constant.UserConstants;
|
||||
import com.ktg.mes.wm.domain.WmIssueLine;
|
||||
import com.ktg.common.utils.StringUtils;
|
||||
import com.ktg.mes.wm.domain.*;
|
||||
import com.ktg.mes.wm.domain.tx.IssueTxBean;
|
||||
import com.ktg.mes.wm.service.IStorageCoreService;
|
||||
import com.ktg.mes.wm.service.IWmIssueLineService;
|
||||
import com.ktg.mes.wm.service.IWmStorageAreaService;
|
||||
import com.ktg.mes.wm.service.*;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
@ -25,8 +24,6 @@ import com.ktg.common.annotation.Log;
|
||||
import com.ktg.common.core.controller.BaseController;
|
||||
import com.ktg.common.core.domain.AjaxResult;
|
||||
import com.ktg.common.enums.BusinessType;
|
||||
import com.ktg.mes.wm.domain.WmIssueHeader;
|
||||
import com.ktg.mes.wm.service.IWmIssueHeaderService;
|
||||
import com.ktg.common.utils.poi.ExcelUtil;
|
||||
import com.ktg.common.core.page.TableDataInfo;
|
||||
|
||||
@ -49,6 +46,15 @@ public class WmIssueHeaderController extends BaseController
|
||||
@Autowired
|
||||
private IStorageCoreService storageCoreService;
|
||||
|
||||
@Autowired
|
||||
private IWmWarehouseService wmWarehouseService;
|
||||
|
||||
@Autowired
|
||||
private IWmStorageLocationService wmStorageLocationService;
|
||||
|
||||
@Autowired
|
||||
private IWmStorageAreaService wmStorageAreaService;
|
||||
|
||||
/**
|
||||
* 查询生产领料单头列表
|
||||
*/
|
||||
@ -95,6 +101,26 @@ public class WmIssueHeaderController extends BaseController
|
||||
if(UserConstants.NOT_UNIQUE.equals(wmIssueHeaderService.checkIssueCodeUnique(wmIssueHeader))){
|
||||
return AjaxResult.error("领料单编号已存在");
|
||||
}
|
||||
//根据领料单头上的仓库、库区、库位ID设置对应的编号和名称
|
||||
if(StringUtils.isNotNull(wmIssueHeader.getWarehouseId())){
|
||||
WmWarehouse warehouse = wmWarehouseService.selectWmWarehouseByWarehouseId(wmIssueHeader.getWarehouseId());
|
||||
wmIssueHeader.setWarehouseCode(warehouse.getWarehouseCode());
|
||||
wmIssueHeader.setWarehouseName(warehouse.getWarehouseName());
|
||||
}
|
||||
|
||||
if(StringUtils.isNotNull(wmIssueHeader.getLocationId())){
|
||||
WmStorageLocation location = wmStorageLocationService.selectWmStorageLocationByLocationId(wmIssueHeader.getLocationId());
|
||||
wmIssueHeader.setLocationCode(location.getLocationCode());
|
||||
wmIssueHeader.setLocationName(location.getLocationName());
|
||||
}
|
||||
|
||||
if(StringUtils.isNotNull(wmIssueHeader.getAreaId())){
|
||||
WmStorageArea area = wmStorageAreaService.selectWmStorageAreaByAreaId(wmIssueHeader.getAreaId());
|
||||
wmIssueHeader.setAreaCode(area.getAreaCode());
|
||||
wmIssueHeader.setAreaName(area.getAreaName());
|
||||
}
|
||||
|
||||
|
||||
return toAjax(wmIssueHeaderService.insertWmIssueHeader(wmIssueHeader));
|
||||
}
|
||||
|
||||
@ -109,6 +135,25 @@ public class WmIssueHeaderController extends BaseController
|
||||
if(UserConstants.NOT_UNIQUE.equals(wmIssueHeaderService.checkIssueCodeUnique(wmIssueHeader))){
|
||||
return AjaxResult.error("领料单编号已存在");
|
||||
}
|
||||
|
||||
//根据领料单头上的仓库、库区、库位ID设置对应的编号和名称
|
||||
if(StringUtils.isNotNull(wmIssueHeader.getWarehouseId())){
|
||||
WmWarehouse warehouse = wmWarehouseService.selectWmWarehouseByWarehouseId(wmIssueHeader.getWarehouseId());
|
||||
wmIssueHeader.setWarehouseCode(warehouse.getWarehouseCode());
|
||||
wmIssueHeader.setWarehouseName(warehouse.getWarehouseName());
|
||||
}
|
||||
|
||||
if(StringUtils.isNotNull(wmIssueHeader.getLocationId())){
|
||||
WmStorageLocation location = wmStorageLocationService.selectWmStorageLocationByLocationId(wmIssueHeader.getLocationId());
|
||||
wmIssueHeader.setLocationCode(location.getLocationCode());
|
||||
wmIssueHeader.setLocationName(location.getLocationName());
|
||||
}
|
||||
|
||||
if(StringUtils.isNotNull(wmIssueHeader.getAreaId())){
|
||||
WmStorageArea area = wmStorageAreaService.selectWmStorageAreaByAreaId(wmIssueHeader.getAreaId());
|
||||
wmIssueHeader.setAreaCode(area.getAreaCode());
|
||||
wmIssueHeader.setAreaName(area.getAreaName());
|
||||
}
|
||||
return toAjax(wmIssueHeaderService.updateWmIssueHeader(wmIssueHeader));
|
||||
}
|
||||
|
||||
|
||||
@ -30,9 +30,19 @@ public class WmBarcode extends BaseEntity
|
||||
@Excel(name = "产品物料ID")
|
||||
private String barcodeContent;
|
||||
|
||||
private Long bussinessId;
|
||||
|
||||
/** 业务编码 */
|
||||
@Excel(name = "业务编码")
|
||||
private String bussinessCode;
|
||||
|
||||
/** 业务名称 */
|
||||
@Excel(name = "业务编码")
|
||||
private String bussinessName;
|
||||
|
||||
/** 条码地址 */
|
||||
@Excel(name = "条码地址")
|
||||
private String url;
|
||||
private String barcodeUrl;
|
||||
|
||||
/** 是否生效 */
|
||||
@Excel(name = "是否生效")
|
||||
@ -90,16 +100,40 @@ public class WmBarcode extends BaseEntity
|
||||
{
|
||||
return barcodeContent;
|
||||
}
|
||||
public void setUrl(String url)
|
||||
{
|
||||
this.url = url;
|
||||
|
||||
public Long getBussinessId() {
|
||||
return bussinessId;
|
||||
}
|
||||
|
||||
public String getUrl()
|
||||
{
|
||||
return url;
|
||||
public void setBussinessId(Long bussinessId) {
|
||||
this.bussinessId = bussinessId;
|
||||
}
|
||||
public void setEnableFlag(String enableFlag)
|
||||
|
||||
public String getBussinessCode() {
|
||||
return bussinessCode;
|
||||
}
|
||||
|
||||
public void setBussinessCode(String bussinessCode) {
|
||||
this.bussinessCode = bussinessCode;
|
||||
}
|
||||
|
||||
public String getBussinessName() {
|
||||
return bussinessName;
|
||||
}
|
||||
|
||||
public void setBussinessName(String bussinessName) {
|
||||
this.bussinessName = bussinessName;
|
||||
}
|
||||
|
||||
public String getBarcodeUrl() {
|
||||
return barcodeUrl;
|
||||
}
|
||||
|
||||
public void setBarcodeUrl(String barcodeUrl) {
|
||||
this.barcodeUrl = barcodeUrl;
|
||||
}
|
||||
|
||||
public void setEnableFlag(String enableFlag)
|
||||
{
|
||||
this.enableFlag = enableFlag;
|
||||
}
|
||||
@ -147,22 +181,20 @@ public class WmBarcode extends BaseEntity
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||
.append("barcodeId", getBarcodeId())
|
||||
.append("barcodeFormart", getBarcodeFormart())
|
||||
.append("barcodeType", getBarcodeType())
|
||||
.append("barcodeContent", getBarcodeContent())
|
||||
.append("url", getUrl())
|
||||
.append("enableFlag", getEnableFlag())
|
||||
.append("remark", getRemark())
|
||||
.append("attr1", getAttr1())
|
||||
.append("attr2", getAttr2())
|
||||
.append("attr3", getAttr3())
|
||||
.append("attr4", getAttr4())
|
||||
.append("createBy", getCreateBy())
|
||||
.append("createTime", getCreateTime())
|
||||
.append("updateBy", getUpdateBy())
|
||||
.append("updateTime", getUpdateTime())
|
||||
.toString();
|
||||
return "WmBarcode{" +
|
||||
"barcodeId=" + barcodeId +
|
||||
", barcodeFormart='" + barcodeFormart + '\'' +
|
||||
", barcodeType='" + barcodeType + '\'' +
|
||||
", barcodeContent='" + barcodeContent + '\'' +
|
||||
", bussinessId=" + bussinessId +
|
||||
", bussinessCode='" + bussinessCode + '\'' +
|
||||
", bussinessName='" + bussinessName + '\'' +
|
||||
", barcodeUrl='" + barcodeUrl + '\'' +
|
||||
", enableFlag='" + enableFlag + '\'' +
|
||||
", attr1='" + attr1 + '\'' +
|
||||
", attr2='" + attr2 + '\'' +
|
||||
", attr3=" + attr3 +
|
||||
", attr4=" + attr4 +
|
||||
'}';
|
||||
}
|
||||
}
|
||||
|
||||
@ -9,7 +9,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<result property="barcodeFormart" column="barcode_formart" />
|
||||
<result property="barcodeType" column="barcode_type" />
|
||||
<result property="barcodeContent" column="barcode_content" />
|
||||
<result property="url" column="url" />
|
||||
<result property="bussinessId" column="bussiness_id"></result>
|
||||
<result property="bussinessCode" column="bussiness_code"></result>
|
||||
<result property="bussinessName" column="bussiness_name"></result>
|
||||
<result property="barcodeUrl" column="barcode_url" />
|
||||
<result property="enableFlag" column="enable_flag" />
|
||||
<result property="remark" column="remark" />
|
||||
<result property="attr1" column="attr1" />
|
||||
@ -23,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectWmBarcodeVo">
|
||||
select barcode_id, barcode_formart, barcode_type, barcode_content, url, enable_flag, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_barcode
|
||||
select barcode_id, barcode_formart, barcode_type, barcode_content,bussiness_id,bussiness_code,bussiness_name, barcode_url, enable_flag, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_barcode
|
||||
</sql>
|
||||
|
||||
<select id="selectWmBarcodeList" parameterType="WmBarcode" resultMap="WmBarcodeResult">
|
||||
@ -32,7 +35,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="barcodeFormart != null and barcodeFormart != ''"> and barcode_formart = #{barcodeFormart}</if>
|
||||
<if test="barcodeType != null and barcodeType != ''"> and barcode_type = #{barcodeType}</if>
|
||||
<if test="barcodeContent != null and barcodeContent != ''"> and barcode_content = #{barcodeContent}</if>
|
||||
<if test="url != null and url != ''"> and url = #{url}</if>
|
||||
<if test="bussinessId != null"> and bussiness_id = #{bussinessId}</if>
|
||||
<if test="bussinessCode != null and bussinessCode !=''"> and bussiness_code = #{bussinessCode}</if>
|
||||
<if test="bussinessName != null and bussinessName !=''"> and bussiness_name = #{bussinessName}</if>
|
||||
<if test="barcodeUrl != null and barcodeUrl != ''"> and barcode_url = #{barcodeUrl}</if>
|
||||
<if test="enableFlag != null and enableFlag != ''"> and enable_flag = #{enableFlag}</if>
|
||||
<if test="attr1 != null and attr1 != ''"> and attr1 = #{attr1}</if>
|
||||
<if test="attr2 != null and attr2 != ''"> and attr2 = #{attr2}</if>
|
||||
@ -52,7 +58,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="barcodeFormart != null and barcodeFormart != ''">barcode_formart,</if>
|
||||
<if test="barcodeType != null and barcodeType != ''">barcode_type,</if>
|
||||
<if test="barcodeContent != null and barcodeContent != ''">barcode_content,</if>
|
||||
<if test="url != null">url,</if>
|
||||
<if test="bussinessId != null"> bussiness_id,</if>
|
||||
<if test="bussinessCode != null and bussinessCode !=''">bussiness_code,</if>
|
||||
<if test="bussinessName != null and bussinessName !=''">bussiness_name,</if>
|
||||
<if test="barcodeUrl != null and barcodeUrl != ''">barcode_url,</if>
|
||||
<if test="enableFlag != null">enable_flag,</if>
|
||||
<if test="remark != null">remark,</if>
|
||||
<if test="attr1 != null">attr1,</if>
|
||||
@ -68,7 +77,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="barcodeFormart != null and barcodeFormart != ''">#{barcodeFormart},</if>
|
||||
<if test="barcodeType != null and barcodeType != ''">#{barcodeType},</if>
|
||||
<if test="barcodeContent != null and barcodeContent != ''">#{barcodeContent},</if>
|
||||
<if test="url != null">#{url},</if>
|
||||
<if test="bussinessId != null"> #{bussinessId},</if>
|
||||
<if test="bussinessCode != null and bussinessCode !=''">#{bussinessCode},</if>
|
||||
<if test="bussinessName != null and bussinessName !=''">#{bussinessName},</if>
|
||||
<if test="barcodeUrl != null and barcodeUrl != ''">#{barcodeUrl},</if>
|
||||
<if test="enableFlag != null">#{enableFlag},</if>
|
||||
<if test="remark != null">#{remark},</if>
|
||||
<if test="attr1 != null">#{attr1},</if>
|
||||
@ -88,7 +100,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="barcodeFormart != null and barcodeFormart != ''">barcode_formart = #{barcodeFormart},</if>
|
||||
<if test="barcodeType != null and barcodeType != ''">barcode_type = #{barcodeType},</if>
|
||||
<if test="barcodeContent != null and barcodeContent != ''">barcode_content = #{barcodeContent},</if>
|
||||
<if test="url != null">url = #{url},</if>
|
||||
<if test="bussinessId != null">bussiness_id = #{bussinessId}</if>
|
||||
<if test="bussinessCode != null and bussinessCode !=''">bussiness_code = #{bussinessCode},</if>
|
||||
<if test="bussinessName != null and bussinessName !=''">bussiness_name = #{bussinessName},</if>
|
||||
<if test="barcodeUrl != null and barcodeUrl != ''">barcode_url = #{barcodeUrl},</if>
|
||||
<if test="enableFlag != null">enable_flag = #{enableFlag},</if>
|
||||
<if test="remark != null">remark = #{remark},</if>
|
||||
<if test="attr1 != null">attr1 = #{attr1},</if>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user