Merge remote-tracking branch 'origin/dev' into test

test
wangwei 2 years ago
commit 0d5f4e69f7

@ -199,8 +199,6 @@ public class UdiContrastController {
} else {
return ResultVOUtils.error(500, "更新失败!");
}
}

@ -397,7 +397,6 @@ public class IoCodeTempController extends BaseController {
//三期校验
if (bussinessTypeEntity.isCodeFillCheck()) {
BaseResponse checkOriginCodeRes = checkOriginCode(udiEntity);
if (checkOriginCodeRes != null) {
IoCodeLostEntity codeLostEntity = codeLostService.findByCode(code);
@ -415,7 +414,6 @@ public class IoCodeTempController extends BaseController {
udiEntity.setExpireDate(codeLostEntity.getExpireDate());
udiEntity.setProduceDate(codeLostEntity.getProduceDate());
}
if (StrUtil.isNotEmpty(orderId)) {
List<IoCodeTempEntity> ioCodeEnttities = codeTempService.findByOrderId(orderId);
IoCodeTempEntity ioCodeEnttity = isExitLocal(code, ioCodeEnttities);
@ -425,6 +423,20 @@ public class IoCodeTempController extends BaseController {
} else
return checkOriginCodeRes;
}
} else {
BaseResponse checkOriginCodeRes = checkOriginCode(udiEntity);
if (checkOriginCodeRes != null) {
IoCodeLostEntity codeLostEntity = codeLostService.findByCode(code);
if (codeLostEntity != null) {
udiEntity.setBatchNo(codeLostEntity.getBatchNo());
udiEntity.setExpireDate(codeLostEntity.getExpireDate());
udiEntity.setProduceDate(codeLostEntity.getProduceDate());
checkOriginCodeRes = checkOriginCode(udiEntity);
if (checkOriginCodeRes != null)
return checkOriginCodeRes;
} else
return checkOriginCodeRes;
}
}
@ -759,11 +771,10 @@ public class IoCodeTempController extends BaseController {
}
}
BaseResponse baseResponse = checkRelId(codeEnttity, unitFk);
if (bussinessTypeEntity.getCheckCertExpire() == 2 && udiRelevanceResponse.isNeedCert()) {
SupProductEntity supProductEntity = supProductService.findByManufactury(udiRelevanceResponse.getCpmctymc(), udiRelevanceResponse.getManufactory(), "");
SupProductEntity supProductEntity = supProductService.findExitByManufactury(udiRelevanceResponse.getCpmctymc(), udiRelevanceResponse.getManufactory());
if (supProductEntity != null && (supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_PASS || supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE_PASS)) {
List<SupCertEntity> supCertEntities = supCertService.findByProductId(supProductEntity.getProductId());
if (CollUtil.isNotEmpty(supCertEntities)) {
@ -774,9 +785,14 @@ public class IoCodeTempController extends BaseController {
}
}
}
} else {
if (supProductEntity == null) {
return ResultVOUtils.error(500, "产品资质证书未维护!");
} else {
return ResultVOUtils.error(500, "产品资质证书未通过审核!");
}
}
}
BaseResponse invRes = checkInv(bussinessTypeEntity, codeEnttity);
@ -1062,7 +1078,7 @@ public class IoCodeTempController extends BaseController {
codeTempEntity.setRelId(codeSaveRequest.getRelId());
int reCount = udiCalCountUtil.getActCount(codeTempEntity);
codeTempEntity.setReCount(reCount);
// codeTempEntity.setReCount(reCount);
}
IoOrderEntity orderEntity = orderService.findByBillNo(codeTempEntity.getOrderId());
BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction());

@ -185,6 +185,9 @@ public class IoOrderController extends BaseController {
public BaseResponse submitBiz(@RequestBody AddOrderRequest addOrderRequest) {
IoOrderEntity orderEntity = orderService.findByBillNo(addOrderRequest.getBillNo());
if (StringUtils.isNotBlank(addOrderRequest.getRemark())) {
orderEntity.setRemark(addOrderRequest.getRemark());
}
BaseResponse tempResponse = checkSubmitEnable(orderEntity);
if (tempResponse != null)
return tempResponse;
@ -226,6 +229,9 @@ public class IoOrderController extends BaseController {
@Log(title = "单据管理", businessType = BusinessType.UPDATE)
public BaseResponse submitCodes(@RequestBody AddOrderRequest addOrderRequest) {
IoOrderEntity orderEntity = orderService.findByBillNo(addOrderRequest.getBillNo());
if (StringUtils.isNotBlank(addOrderRequest.getRemark())) {
orderEntity.setRemark(addOrderRequest.getRemark());
}
BaseResponse tempResponse = checkSubmitEnable(orderEntity);
if (tempResponse != null)
return tempResponse;

@ -167,7 +167,7 @@ public class IoOrderDetailBizController extends BaseController {
UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectSupGroupById(item.getRelId(), addBizProductReqeust.getSupId());
BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction());
if (bussinessTypeEntity.getCheckCertExpire() == 2 && udiRelevanceResponse.isNeedCert()) {
SupProductEntity supProductEntity = supProductService.findByManufactury(udiRelevanceResponse.getCpmctymc(), udiRelevanceResponse.getManufactory(), "");
SupProductEntity supProductEntity = supProductService.findExitByManufactury(udiRelevanceResponse.getCpmctymc(), udiRelevanceResponse.getManufactory());
if (supProductEntity != null && (supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_PASS || supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE_PASS)) {
List<SupCertEntity> supCertEntities = supCertService.findByProductId(supProductEntity.getProductId());

@ -0,0 +1,89 @@
package com.glxp.api.controller.inv;
import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.req.inv.ErrorMsgRequest;
import com.glxp.api.req.inv.FilterInvPreProductRequest;
import com.glxp.api.req.inv.FilterInvPreinProductRequest;
import com.glxp.api.req.inv.FilterInvProductRequest;
import com.glxp.api.res.inv.InvPreProductResponse;
import com.glxp.api.res.inv.InvPreinProductResponse;
import com.glxp.api.res.inv.InvProductPageResponse;
import com.glxp.api.res.inv.InvProductResponse;
import com.glxp.api.service.inv.InvPreProductService;
import com.glxp.api.service.inv.InvPreinProductService;
import com.glxp.api.service.inv.InvProductService;
import com.glxp.api.util.FileUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.io.IOException;
import java.util.List;
/**
*
*/
@RestController
public class VailInvController {
@Resource
private InvProductService invProductService;
@Resource
private InvPreinProductService invPreinProductService;
@Resource
private InvPreProductService invPreProductService;
@Value("${err_path}")
String errPath;
@AuthRuleAnnotation("")
@GetMapping("/spms/inv/product/vail")
public BaseResponse invProductVail(FilterInvProductRequest filterInvProductRequest) {
List<InvProductResponse> list = invProductService.filterListProduct(filterInvProductRequest);
PageInfo<InvProductResponse> pageInfo = new PageInfo<>(list);
InvProductPageResponse<InvProductResponse> pageResponse = new InvProductPageResponse();
pageResponse.setList(pageInfo.getList());
pageResponse.setTotal(pageInfo.getTotal());
return ResultVOUtils.success(pageResponse);
}
@AuthRuleAnnotation("")
@GetMapping("/spms/inv/pre/product/vail")
public BaseResponse invPreProductVail(FilterInvPreProductRequest filterInvProductRequest) {
List<InvPreProductResponse> list = invPreProductService.filterList(filterInvProductRequest);
PageInfo<InvPreProductResponse> pageInfo = new PageInfo<>(list);
InvProductPageResponse<InvPreProductResponse> pageResponse = new InvProductPageResponse();
pageResponse.setList(pageInfo.getList());
pageResponse.setTotal(pageInfo.getTotal());
return ResultVOUtils.success(pageResponse);
}
@AuthRuleAnnotation("")
@GetMapping("/spms/inv/preIn/product/vail")
public BaseResponse invPreInProductVail(FilterInvPreinProductRequest filterInvProductRequest) {
List<InvPreinProductResponse> list = invPreinProductService.filterList(filterInvProductRequest);
PageInfo<InvPreinProductResponse> pageInfo = new PageInfo<>(list);
InvProductPageResponse<InvPreinProductResponse> pageResponse = new InvProductPageResponse();
pageResponse.setList(pageInfo.getList());
pageResponse.setTotal(pageInfo.getTotal());
return ResultVOUtils.success(pageResponse);
}
@PostMapping("/spms/inv/vail/errMsg")
public void genErrorLog(@RequestBody ErrorMsgRequest errorMsgRequest) {
try {
FileUtils.writeFile(errPath, "库存校验-", errorMsgRequest.getErrMsg());
} catch (IOException e) {
e.printStackTrace();
}
}
}

@ -18,6 +18,7 @@ import com.glxp.api.service.system.SystemPDFTemplateService;
import com.glxp.api.util.JasperUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
@ -36,6 +37,8 @@ public class SysPdfTemplateController {
@Resource
private SystemPDFTemplateService systemPDFTemplateService;
@Value("${file_path}")
private String filePath;
@AuthRuleAnnotation("system/pdf/template/list")
@GetMapping("/system/pdf/template/list")
@ -84,7 +87,7 @@ public class SysPdfTemplateController {
"[{\"area\":\"福建省厦门市湖里区\",\"vaiDate\":\"2023-03-15\",\"code\":\"1113\",\"companyName\":\"盛夏科技\",\"classes\":\"经营企业\",\"mobile\":\"18575144832\",\"index\":\"1\",\"remark\":\"12\",\"detailAddr\":\"湖里\",\"name\":\"业务许可证\",\"creditNum\":\"6464684643\",\"auditStatus\":\"审核通过\",\"expireDate\":\"2023-03-16\",\"contacts\":\"东\",\"email\":\"46456@qq.com\",\"status\":\"有效\"}]";
}
JasperUtils.jasperReport(request, response, data, systemPDFTemplateEntity.getPath(), "pdf");
JasperUtils.jasperReport(request, response, data, filePath + "/pdf/template/"+systemPDFTemplateEntity.getPath(), "pdf");

@ -215,8 +215,11 @@ public class ThrProductsController {
// udiProductEntity.setGgxh(thrProductsEntity.getStandard());
udiProductService.updateUdiInfo(udiProductEntity);
}
}
//todo 若产品信息
return ResultVOUtils.success("修改成功!");
}

@ -30,4 +30,6 @@ public interface SupProductDao extends BaseMapperPlus<SupProductDao, SupProductE
boolean deleteById(@Param("id") String id);
boolean deleteByEnterpriseId(@Param("enterpriseId") String enterpriseId);
SupProductEntity findByManufactury(@Param("cpmctymc") String cpmctymc, @Param("manufactory") String manufactory);
}

@ -184,7 +184,6 @@ public class BasicBussinessTypeEntity {
private String supplementOrderType;
/**
*
*/
@ -280,6 +279,21 @@ public class BasicBussinessTypeEntity {
*/
@TableField(value = "checkCopy")
private int checkCopy;
/**
*
*/
@TableField(value = "checkReview")
private int checkReview;
/**
*
*/
@TableField(value = "secCheckReview")
private boolean seccheckReview;
/**
*
*/
@TableField(value = "thrCheckReview")
private boolean thrCheckReview;
/**
*
@ -414,4 +428,6 @@ public class BasicBussinessTypeEntity {
//是否按货位出库 0不按货位出库1:按货位出库
@TableField(value = "spaceOut")
private int spaceOut;
}

@ -0,0 +1,8 @@
package com.glxp.api.req.inv;
import lombok.Data;
@Data
public class ErrorMsgRequest {
String errMsg;
}

@ -10,7 +10,7 @@ import java.util.List;
@Data
public class ThrUnitMaintainFilterRequest extends ListPageRequest {
private Integer id;
private Long id;
private String key;
private String unitId;
private String name;

@ -152,7 +152,17 @@ public class BasicBussinessTypeResponse {
private String checkPreInOrders;
private Boolean advancePreIn;
private Integer sortNum;
private int spaceOut;
/**
*
*/
private int checkReview;
/**
*
*/
private boolean seccheckReview;
/**
*
*/
private boolean thrCheckReview;
}

@ -8,7 +8,7 @@ import java.util.Date;
@Data
public class ThrUnitMaintainResponse {
private Integer id;
private Long id;
private String erpId;
@NotBlank(message = "往来单位名称不能为空!")

@ -80,6 +80,7 @@ public class IoCheckInoutService {
/**
*
*
* @param billNo
* @return
*/
@ -125,6 +126,10 @@ public class IoCheckInoutService {
if (bussinessTypeEntity.getCheckCopy() == 0) {
return false;
}
} else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_REVIEW) {
if (bussinessTypeEntity.getCheckReview() == 0) {
return false;
}
}
return true;
}
@ -132,6 +137,7 @@ public class IoCheckInoutService {
/**
* |
*
* @param orderId
*/
public void check(String orderId) {
@ -194,6 +200,11 @@ public class IoCheckInoutService {
unCheckFirstFinish(orderEntity);
return;
}
} else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_REVIEW) {
if (bussinessTypeEntity.getCheckReview() == 0) {
unCheckFirstFinish(orderEntity);
return;
}
}
checkFirstFinish(orderEntity);
}
@ -216,6 +227,10 @@ public class IoCheckInoutService {
codeLostEntity.setId(IdUtil.getSnowflakeNextId());
codeLostEntity.setNameCode(udiEntity.getUdi());
codeLostEntity.setCode(codeEntity.getCode());
codeLostEntity.setBatchNo(codeEntity.getBatchNo());
codeLostEntity.setProduceDate(codeEntity.getProduceDate());
codeLostEntity.setExpireDate(codeEntity.getExpireDate());
codeLostEntity.setSerialNo(codeEntity.getSerialNo());
}
//校验是否写入缺失表
boolean isTrue = false;
@ -771,6 +786,10 @@ public class IoCheckInoutService {
if (!bussinessTypeEntity.isThrCheckSp()) {
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_REW);
}
} else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_REVIEW) {
if (!bussinessTypeEntity.isThrCheckReview()) {
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_REW);
}
}
} else {
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_REW);
@ -782,6 +801,7 @@ public class IoCheckInoutService {
if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK_REW) {
orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_REW);
orderEntity.setUpdateTime(new Date());
if (IntUtil.value(orderEntity.getFromType()) != ConstantStatus.FROM_UDISP)
orderEntity.setCheckTime(new Date());
orderService.update(orderEntity);
checkSecond(orderEntity);
@ -830,6 +850,10 @@ public class IoCheckInoutService {
if (!bussinessTypeEntity.isSecCheckSp()) {
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_AUDITED);
}
} else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_REVIEW) {
if (!bussinessTypeEntity.isSeccheckReview()) {
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_AUDITED);
}
}
} else {
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_AUDITED);
@ -839,6 +863,7 @@ public class IoCheckInoutService {
if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_AUDITED) {
orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_CHECK);
orderEntity.setUpdateTime(new Date());
if (IntUtil.value(orderEntity.getFromType()) != ConstantStatus.FROM_UDISP)
orderEntity.setAuditTime(new Date());
if (StrUtil.isEmpty(orderEntity.getReviewUser())) {
orderEntity.setReviewUser(orderEntity.getReviewUser());

@ -112,9 +112,15 @@ public class InvInnerOrderPrintServiceImpl implements InvInnerOrderPrintService
filterUdiRelRequest.setId(Long.valueOf(obj.getProductId()));
filterUdiRelRequest.setPackLevel(udiRelevanceDao.selectPackLevel(obj.getNameCode()));
System.out.println(filterUdiRelRequest.getPackLevel());
int a=0;
if (filterUdiRelRequest.getPackLevel()==null){
a=0;
}else {
a=Integer.parseInt(filterUdiRelRequest.getPackLevel())-1;
}
//查询耗材字典信息
//UdiRelevanceResponse filterUdiRelevance = udiRelevanceDao.filterUdiRelevance(filterUdiRelRequest).get(0);
UdiRelevanceResponse filterUdiRelevance = udiRelevanceDao.filterUdiRelevance(filterUdiRelRequest).get(Integer.parseInt(filterUdiRelRequest.getPackLevel())-1);
UdiRelevanceResponse filterUdiRelevance = udiRelevanceDao.filterUdiRelevance(filterUdiRelRequest).get(a);
//查询产品信息
UdiProductEntity udiProductEntity = udiProductService.findByNameCode(filterUdiRelevance.getNameCode());

@ -20,6 +20,8 @@ public interface SupProductService extends IService<SupProductEntity> {
SupProductEntity findByManufactury(String cpmctymc, String manufactory, String manufacturerIdFk);
SupProductEntity findExitByManufactury(String cpmctymc, String manufactory);
SupProductResponse findByPassByReCert(String registerCert);
SupProductResponse findJoinRegistration(Long id);

@ -102,6 +102,11 @@ public class SupProductServiceImpl extends ServiceImpl<SupProductDao, SupProduct
else return null;
}
@Override
public SupProductEntity findExitByManufactury(String cpmctymc, String manufactory) {
return supProductDao.findByManufactury(cpmctymc, manufactory);
}
@Override
public SupProductEntity findRegistrationByName(String recordProductName) {
return supProductDao.findRegistrationByName(recordProductName);

@ -54,7 +54,7 @@ public class uploadController {
file.transferTo(file1);
Map<String, String> rMap = new HashMap<>();
rMap.put("msg", "上传成功");
rMap.put("path", savePath + "/" + newName);
rMap.put("path", newName);
return ResultVOUtils.success(rMap);
} catch (IOException e) {
e.printStackTrace();

@ -1,6 +1,8 @@
package com.glxp.api.util;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import org.apache.commons.beanutils.PropertyUtilsBean;
import java.io.BufferedReader;
import java.io.ByteArrayOutputStream;
@ -949,4 +951,24 @@ public class FileUtils {
e.printStackTrace();
}
}
public static String writeFile(String filePath, String fileDesc, String content) throws IOException {
filePath = String.format("%s/%s", filePath, DateUtil.getDate());
String fileFullPath = String.format("%s/%s-%s.udi", filePath, fileDesc, IdUtil.fastSimpleUUID());
File file = new File(filePath);
if (!file.exists()) {
file.mkdirs();
}
file = new File(fileFullPath);
while (!file.createNewFile()) {
fileFullPath = String.format("%s/%s/%s-%s.udi", filePath, DateUtil.getDate(), fileDesc, IdUtil.fastSimpleUUID());
file = new File(fileFullPath);
}
FileWriter fileWriter = new FileWriter(file);
fileWriter.write(content);
fileWriter.flush();
fileWriter.close();
return fileFullPath;
}
}

@ -3,7 +3,7 @@ server:
spring:
datasource:
driver-class-name: com.p6spy.engine.spy.P6SpyDriver
jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_spms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_spms_pt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
username: root
password: 123456
hikari:
@ -45,6 +45,7 @@ logging:
file_path: d:/udi/inUdiwms/udiwmsfile/
back_file_path: d:/share/udisps/back/
err_path: d:/udi/udiwms/err/
UDI_KEY: 6b137c66-6286-46c6-8efa-c2f5dd9237df
UDI_SERVER_URL: https://www.udims.com/UDI_DL_Server_test
SPMS_KEY: lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs

@ -45,6 +45,7 @@ logging:
file_path: /udi/udiwms/udiwmsfile/
back_file_path: /share/udisps/back/
err_path: d:/udi/udiwms/err/
UDI_KEY: 6b137c66-6286-46c6-8efa-c2f5dd9237df
UDI_SERVER_URL: https://www.udims.com/UDI_DL_Server_test
SPMS_KEY: lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs

@ -45,6 +45,7 @@ logging:
file_path: /udi/udiwms/udiwmsfile/
back_file_path: /share/udisps/back/
err_path: /udi/udiwms/err/
UDI_KEY: 6b137c66-6286-46c6-8efa-c2f5dd9237df
UDI_SERVER_URL: https://www.udims.com/UDI_DL_Server_test
SPMS_KEY: lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs

@ -51,6 +51,7 @@ knife4j:
file_path: /udi/udiwms/udiwmsfile/
back_file_path: /share/udisps/back/
err_path: /udi/udiwms/err/
UDI_KEY: 6b137c66-6286-46c6-8efa-c2f5dd9237df
UDI_SERVER_URL: https://www.udims.com/UDI_DL_Server_test
SPMS_KEY: lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs

@ -45,6 +45,7 @@ logging:
file_path: /udi/udiwms/udiwmsfile/
back_file_path: /share/udisps/back/
err_path: /udi/udiwms/err/
UDI_KEY: 6b137c66-6286-46c6-8efa-c2f5dd9237df
UDI_SERVER_URL: https://www.udims.com/UDI_DL_Server_test
SPMS_KEY: lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs

@ -45,6 +45,7 @@ logging:
file_path: /udi/udiwms/udiwmsfile/
back_file_path: /share/udisps/back/
err_path: /udi/udiwms/err/
UDI_KEY: 6b137c66-6286-46c6-8efa-c2f5dd9237df
UDI_SERVER_URL: https://www.udims.com/UDI_DL_Server_test
SPMS_KEY: lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs

@ -193,7 +193,7 @@
b1.`name`
FROM auth_warehouse_bustype a1
INNER JOIN basic_bussiness_type b1 ON a1.action = b1.action
where b1.spUse = 1
where (b1.spUse = 1 or b1.spUse = 2)
and a1.code = #{code}
group by b1.id
</select>

@ -17,6 +17,7 @@
'%Y-%m-%d') and date_format(#{endDate}, '%Y-%m-%d')
</if>
</where>
ORDER BY inv_inner_order.createTime DESC
</select>
<insert id="insert" keyProperty="id"

@ -389,4 +389,12 @@
FROM sup_product
WHERE enterpriseId = #{enterpriseId}
</delete>
<select id="findByManufactury" parameterType="Map"
resultType="com.glxp.api.entity.purchase.SupProductEntity">
select sup_product.*
from sup_product
INNER JOIN sup_manufacturer on sup_product.manufacturerIdFk = sup_manufacturer.manufacturerId
WHERE sup_manufacturer.companyName = #{manufactory}
and sup_product.recordProductName = #{cpmctymc}
</select>
</mapper>

@ -438,6 +438,10 @@ CALL Pro_Temp_ColumnWork('io_order', 'rmDeptCode', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('io_order', 'rmInvCode', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('io_order', 'outSickInfo', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('inv_inner_order_detail', 'nameCode', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('inv_inner_order_detail', 'nameCode',
'varchar(255) ', 1);
CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'checkReview', 'tinyint', 1);
CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'secCheckReview', 'tinyint', 1);
CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckReview', 'tinyint', 1);

Loading…
Cancel
Save