修改1.2级程度bug

zhairh
郑明梁 3 years ago
parent 64a503fe67
commit 1125e6fd3f

@ -5,12 +5,15 @@ import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.sale.admin.annotation.AuthRuleAnnotation;
import com.glxp.sale.admin.constant.ConstantStatus;
import com.glxp.sale.admin.dao.info.BasicProductSetDao;
import com.glxp.sale.admin.dao.inventory.InvProductDao;
import com.glxp.sale.admin.entity.auth.AuthAdmin;
import com.glxp.sale.admin.entity.basic.BussinessLocalTypeEntity;
import com.glxp.sale.admin.entity.basic.UdiInfoEntity;
import com.glxp.sale.admin.entity.inout.StockOrderDetailEntity;
import com.glxp.sale.admin.entity.inout.StockOrderEntity;
import com.glxp.sale.admin.entity.inout.WarehouseEntity;
import com.glxp.sale.admin.entity.inventory.InvProductEntity;
import com.glxp.sale.admin.entity.param.SystemParamConfigEntity;
import com.glxp.sale.admin.entity.udid.UdiEntity;
import com.glxp.sale.admin.exception.JsonException;
@ -36,6 +39,7 @@ import com.glxp.sale.admin.service.inout.CodesService;
import com.glxp.sale.admin.service.inout.StockOrderDetailService;
import com.glxp.sale.admin.service.inout.StockOrderDetailTempService;
import com.glxp.sale.admin.service.inout.StockOrderService;
import com.glxp.sale.admin.service.inventory.InvProductService;
import com.glxp.sale.admin.service.param.SystemParamConfigService;
import com.glxp.sale.admin.service.purchase.SupProductService;
import com.glxp.sale.admin.util.Constant;
@ -83,6 +87,9 @@ public class StockOrderDetailController {
CodesService codesService;
@Resource
SupProductService supProductService;
@Resource
InvProductService invProductService;
@AuthRuleAnnotation("")
@GetMapping("/udiwms/stock/order/detail/filter")
@ -587,6 +594,30 @@ public class StockOrderDetailController {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
//判断
InvProductEntity invProductEntity=invProductService.selectExit(stockOrderDetailFilterRequest.getProductId());
if(invProductEntity!=null){
UdiInfoEntity udiInfoEntity= udiInfoService.findByNameCode(invProductEntity.getNameCode());
if(udiInfoEntity!=null){
if(udiInfoEntity.getScbssfbhph().equals("是")){
if(stockOrderDetailFilterRequest.getBatchNo()==null){
return ResultVOUtils.error(999,"批次号不能为空!");
}
}
if(udiInfoEntity.getScbssfbhscrq().equals("是")){
if(stockOrderDetailFilterRequest.getProductDate()==null){
return ResultVOUtils.error(999,"生产日期不能为空!");
}
}
if(udiInfoEntity.getScbssfbhsxrq().equals("是")){
if(stockOrderDetailFilterRequest.getExpireDate()==null){
return ResultVOUtils.error(999,"失效日期不能为空!");
}
}
}
}
if (StringUtils.isNotBlank(stockOrderDetailFilterRequest.getId())) {
if (StringUtils.isBlank(stockOrderDetailFilterRequest.getCount()) ||
StringUtils.isBlank(stockOrderDetailFilterRequest.getReCount())) {
@ -660,7 +691,7 @@ public class StockOrderDetailController {
/**
*
*
* @param stockOrderDetailEntities
* @param
* @return
*/
@AuthRuleAnnotation("")

@ -607,6 +607,7 @@ public class WareHouseController {
addOrderRequest.setAction(addOrderRequest.getBillType());
}
BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(addOrderRequest.getAction());
String code = addOrderRequest.getCode();
if (StringUtils.isBlank(code)) return ResultVOUtils.error(ResultEnum.DATA_ERROR);
UdiEntity udiEntity = FilterUdiUtils.getUdi(code);
@ -839,7 +840,7 @@ public class WareHouseController {
if (udiRelevanceResponse.getBhzxxsbzsl() == 0) {
actCount = udiRelevanceResponse.getZxxsbzbhsydysl();
} else {
actCount = udiRelevanceResponse.getBhzxxsbzsl() * udiRelevanceResponse.getBhzxxsbzsl();
actCount = udiRelevanceResponse.getBhzxxsbzsl() * udiRelevanceResponse.getZxxsbzbhsydysl();
}
} else {
actCount = udiRelevanceResponse.getBhzxxsbzsl();
@ -907,7 +908,9 @@ public class WareHouseController {
return baseResponse;
}
checkSupId(bussinessTypeEntity, warehouseEntity);
return baseResponse;
}

@ -51,4 +51,6 @@ public interface UdiInfoDao {
*/
void importUdiInfo(@Param("udiInfoEntities") List<UdiInfoEntity> udiInfoEntities);
boolean updateUdiInfoNotAll(UdiInfoRequest udiInfoRequest);
}

@ -38,4 +38,6 @@ public interface UdiInfoService {
boolean deleteByUuid(String uuid);
boolean updateUdiInfoNotAll(UdiInfoRequest udiInfoRequest);
}

@ -117,4 +117,12 @@ public class UdiInfoServiceImpl implements UdiInfoService {
public boolean deleteByUuid(String uuid) {
return udiInfoDao.deleteByUuid(uuid);
}
@Override
public boolean updateUdiInfoNotAll(UdiInfoRequest udiInfoRequest) {
if (StrUtil.isEmpty(udiInfoRequest.getUuid()))
return false;
return udiInfoDao.updateUdiInfoNotAll(udiInfoRequest);
}
}

@ -48,7 +48,7 @@ public class CompanyProductsRelService {
UdiRelevanceRequest udiRelevanceRequest=new UdiRelevanceRequest();
org.springframework.beans.BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest);
udiRelevanceService.updateUdiRelevance(udiRelevanceRequest);
udiInfoService.updateUdiInfo(udiInfoRequest);
udiInfoService.updateUdiInfoNotAll(udiInfoRequest);
companyProductRelevanceEntity.setCreate_time(new Date());
companyProductRelevanceEntity.setUpdate_time(new Date());
companyProductRelevanceEntity.setAuditStatus("3");

@ -82,8 +82,8 @@
<select id="filterJoinEntrustRec" parameterType="com.glxp.sale.admin.req.basic.BasicEntrustRecRequest"
resultType="com.glxp.sale.admin.res.basic.EntrustReceResponse">
select basic_entrust_accept.* ,
a.name curName, b.name entrustName,auth_user.employeeName
,c.name entrustInvName,d.name curInvName
a.name as curName, b.name as entrustName,auth_user.employeeName
,c.name as entrustInvName,d.name as curInvName
from basic_entrust_accept
LEFT JOIN basic_bustype_local a on basic_entrust_accept.action = a.action
LEFT JOIN basic_bussiness_type b on basic_entrust_accept.entrustAction = b.action

@ -344,4 +344,55 @@
#{item.scbssfbhsxrq},#{item.cpms},#{item.originUuid},#{allowNoBatch},#{allowNoExpire},#{allowNoProduct},#{spmc})
</foreach>
</insert>
<update id="updateUdiInfoNotAll" parameterType="com.glxp.sale.admin.req.basic.UdiInfoRequest">
UPDATE basic_products
<trim prefix="set" suffixOverrides=",">
<if test="packRatio != null">packRatio=#{packRatio},</if>
<if test="packLevel != null">packLevel=#{packLevel},</if>
<if test="bhxjsl != null">bhxjsl=#{bhxjsl},</if>
<if test="bhzxxsbzsl != null">bhzxxsbzsl=#{bhzxxsbzsl},</if>
<if test="zxxsbzbhsydysl != null">zxxsbzbhsydysl=#{zxxsbzbhsydysl},</if>
<if test="bhxjcpbm != null">bhxjcpbm=#{bhxjcpbm},</if>
<if test="bzcj != null">bzcj=#{bzcj},</if>
<if test="addType != null">addType=#{addType},</if>
<if test="deviceRecordKey != null">deviceRecordKey=#{deviceRecordKey},</if>
<if test="cpmctymc != null">cpmctymc=#{cpmctymc},</if>
<if test="cplb != null">cplb=#{cplb},</if>
<if test="flbm != null">flbm=#{flbm},</if>
<if test="ggxh != null">ggxh=#{ggxh},</if>
<if test="qxlb != null">qxlb=#{qxlb},</if>
<if test="tyshxydm != null">tyshxydm=#{tyshxydm},</if>
<if test="ylqxzcrbarmc != null">ylqxzcrbarmc=#{ylqxzcrbarmc},</if>
<if test="ylqxzcrbarywmc != null">ylqxzcrbarywmc=#{ylqxzcrbarywmc},</if>
<if test="uuid != null">uuid=#{uuid},</if>
<if test="sjcpbm != null">sjcpbm=#{sjcpbm},</if>
<if test="versionNumber != null">versionNumber=#{versionNumber},</if>
<if test="sptm != null">sptm=#{sptm},</if>
<if test="manufactory != null">manufactory=#{manufactory},</if>
<if test="ybbm != null">ybbm=#{ybbm},</if>
<if test="measname != null">measname=#{measname},</if>
<if test="diType != null">diType=#{diType},</if>
<if test="productType != null">productType=#{productType},</if>
<if test="scbssfbhph != null">scbssfbhph=#{scbssfbhph},</if>
<if test="scbssfbhxlh != null">scbssfbhxlh=#{scbssfbhxlh},</if>
<if test="scbssfbhscrq != null">scbssfbhscrq=#{scbssfbhscrq},</if>
<if test="scbssfbhsxrq != null">scbssfbhsxrq=#{scbssfbhsxrq},</if>
<if test="cpms != null">cpms=#{cpms},</if>
<if test="originUuid != null">originUuid=#{originUuid},</if>
<if test="spmc != null">spmc=#{spmc},</if>
<if test="cpdls != null">cpdls=#{cpdls},</if>
<if test="basicPrductRemak1 != null">basicPrductRemak1=#{basicPrductRemak1},</if>
<if test="basicPrductRemak2 != null">basicPrductRemak2=#{basicPrductRemak2},</if>
<if test="basicPrductRemak3 != null">basicPrductRemak3=#{basicPrductRemak3},</if>
<if test="basicPrductRemak4 != null">basicPrductRemak4=#{basicPrductRemak4},</if>
<if test="basicPrductRemak5 != null">basicPrductRemak5=#{basicPrductRemak5},</if>
<if test="basicPrductRemak6 != null">basicPrductRemak6=#{basicPrductRemak6},</if>
<if test="basicPrductRemak7 != null">basicPrductRemak7=#{basicPrductRemak7},</if>
<if test="basicPrductRemak8 != null">basicPrductRemak8=#{basicPrductRemak8},</if>
</trim>
WHERE uuid = #{uuid}
</update>
</mapper>
Loading…
Cancel
Save