解决了上传物资系统排序问题，还有价格对应不上问题
anthonywj
2 years ago
parent
b5b2359925
commit
941941f31b
@ -1,12 +1,17 @@
|
||||
package com.glxp.mipsdl.admin.dao.basic;
|
||||
|
||||
import com.glxp.mipsdl.admin.entity.basic.UdiRelevanceEntity;
|
||||
import com.glxp.mipsdl.admin.req.basic.FilterUdiInfoRequest;
|
||||
import com.glxp.mipsdl.admin.res.basic.UdiRelevanceResponse;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface UdiRelevanceDao {
|
||||
|
||||
UdiRelevanceEntity selectById(@Param("id") String id);
|
||||
|
||||
List<UdiRelevanceResponse> filterUdiRelevance(FilterUdiInfoRequest filterUdiInfoRequest);
|
||||
}
|
||||
|
||||
@ -0,0 +1,101 @@
|
||||
package com.glxp.mipsdl.admin.res.basic;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class UdiRelevanceResponse {
|
||||
|
||||
private Integer id;
|
||||
private String thirdId;
|
||||
private String thirdName;
|
||||
private String uuid;
|
||||
private String nameCode;
|
||||
private String packLevel;
|
||||
private String packRatio;
|
||||
private Integer bhxjsl;
|
||||
private Integer bhzxxsbzsl;
|
||||
private Integer zxxsbzbhsydysl;
|
||||
private String bhxjcpbm;
|
||||
private String sjcpbm; //
|
||||
private String bzcj;
|
||||
private String addType;
|
||||
private String deviceRecordKey;
|
||||
private int isUseDy;
|
||||
private String cpmctymc;
|
||||
private String cplb;
|
||||
private String flbm;
|
||||
private String ggxh;
|
||||
private String qxlb;
|
||||
private String tyshxydm;
|
||||
private String ylqxzcrbarmc;
|
||||
private String zczbhhzbapzbh;
|
||||
private String ylqxzcrbarywmc;
|
||||
private String sydycpbs;
|
||||
private int versionNumber;
|
||||
private int diType;
|
||||
private String batchNo;
|
||||
private String warehouseName;
|
||||
private String thirdId1;
|
||||
private String thirdName1;
|
||||
private String thirdId2;
|
||||
private String thirdName2;
|
||||
private String thirdId3;
|
||||
private String thirdName3;
|
||||
private String thirdId4;
|
||||
private String thirdName4;
|
||||
private String ybbm;
|
||||
private String sptm;
|
||||
private Boolean isDisable;
|
||||
private String erpId;
|
||||
private String erpName;
|
||||
private Integer productType;
|
||||
private Boolean isSelect;
|
||||
private Boolean isLock;
|
||||
private String mainId;
|
||||
private String mainName;
|
||||
private Integer lockStatus;
|
||||
private String udplatCode;
|
||||
private Boolean isAdavence;
|
||||
private String scbssfbhph;
|
||||
private String scbssfbhxlh;
|
||||
private String scbssfbhscrq;
|
||||
private String scbssfbhsxrq;
|
||||
private String cpms;
|
||||
private String supName;
|
||||
private String manufactory;
|
||||
private String measname;
|
||||
private String unitFk;
|
||||
private String companyName;
|
||||
private String originUuid;
|
||||
private boolean allowNoBatch;
|
||||
private boolean allowNoExpire;
|
||||
private boolean allowNoProduct;
|
||||
private String spmc;
|
||||
private String cplx;
|
||||
private String hchzsb;
|
||||
|
||||
private String price;
|
||||
|
||||
|
||||
private String basicPrductRemak1;
|
||||
private String basicPrductRemak2;
|
||||
private String basicPrductRemak3;
|
||||
private String basicPrductRemak4;
|
||||
private String basicPrductRemak5;
|
||||
private String basicPrductRemak6;
|
||||
private String basicPrductRemak7;
|
||||
private String basicPrductRemak8;
|
||||
private Boolean useMuti; //是否多次使用
|
||||
private Integer useNum; //最小包装单元可使用次数
|
||||
private Integer pid; //用来存父id
|
||||
|
||||
//产品代理商
|
||||
private String cpdls;
|
||||
|
||||
public int getBhzxxsbzsl() {
|
||||
if (bhzxxsbzsl == null || bhzxxsbzsl == 0) {
|
||||
return 1;
|
||||
} else
|
||||
return bhzxxsbzsl;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,39 @@
|
||||
package com.glxp.mipsdl.admin.service.basic;
|
||||
|
||||
import com.glxp.mipsdl.admin.dao.basic.UdiRelevanceDao;
|
||||
import com.glxp.mipsdl.admin.entity.basic.UdiRelevanceEntity;
|
||||
import com.glxp.mipsdl.admin.req.basic.FilterUdiInfoRequest;
|
||||
import com.glxp.mipsdl.admin.res.basic.UdiRelevanceResponse;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
public class BasicUdiService {
|
||||
@Resource
|
||||
UdiRelevanceDao udiRelevanceDao;
|
||||
|
||||
public int getActCount(String relId, String nameCode) {
|
||||
UdiRelevanceEntity udiRelevanceEntity = udiRelevanceDao.selectById(relId);
|
||||
FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
|
||||
filterUdiInfoRequest.setUniqueNameCode(nameCode);
|
||||
List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceDao.filterUdiRelevance(filterUdiInfoRequest);
|
||||
|
||||
UdiRelevanceResponse udiInfoBean = null;
|
||||
if (udiRelevanceResponses != null && udiRelevanceResponses.size() > 0) {
|
||||
udiInfoBean = udiRelevanceResponses.get(0);
|
||||
}
|
||||
if (udiInfoBean != null) {
|
||||
if ((udiRelevanceEntity.getIsUseDy() != null && udiRelevanceEntity.getIsUseDy()) && udiInfoBean.getDiType() != 2) {
|
||||
if (udiInfoBean.getBhzxxsbzsl() == 0)
|
||||
return udiInfoBean.getZxxsbzbhsydysl();
|
||||
else
|
||||
return udiInfoBean.getZxxsbzbhsydysl() * udiInfoBean.getBhzxxsbzsl();
|
||||
} else {
|
||||
return udiInfoBean.getBhzxxsbzsl();
|
||||
}
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue