Merge remote-tracking branch 'origin/master'

master
陈恒杰 5 months ago
commit 6095efa114

@ -156,4 +156,10 @@ public class OdsProcureOutOrderController extends BaseController {
List<OdsProcureOutOrder> list = odsProcureOutOrderService.listckTS(odsProcureOutOrder);
return getDataTable(list);
}
//特殊出库
@PostMapping("/addOdsProcureOutOrderTS")
public AjaxResult addOdsProcureOutOrderTS( @RequestBody List<OdsProcureOutOrder> orderList) {
String result = odsProcureOutOrderService.addOdsProcureOutOrderTS(orderList);
return success(result);
}
}

@ -2,8 +2,10 @@ package com.op.wms.controller;
import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
import com.op.common.core.domain.R;
import com.op.common.core.utils.StringUtils;
import com.op.common.core.utils.uuid.IdUtils;
import com.op.common.core.web.domain.AjaxResult;
import com.op.wms.domain.*;
@ -11,6 +13,8 @@ import com.op.wms.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import static com.op.common.core.web.domain.AjaxResult.error;
@ -890,4 +894,17 @@ public class WmsToWCSmissionController {
wmsSellOutEmbryoService.SynchronizationOfShippingDocuments();
return R.ok();
}
//特殊出库
@PostMapping("/listOdsProcureOutOrderTS")
public AjaxResult listOdsProcureOutOrderTS(@RequestBody OdsProcureOutOrder order) {
List<OdsProcureOutOrder> result = odsProcureOutOrderService.listOdsProcureOutOrderTS(order);
return success(result);
}
@PostMapping("/OdsProcureOutOrderTSCK")
public AjaxResult OdsProcureOutOrderTSCK(@RequestBody OdsProcureOutOrder order) {
String result = odsProcureOutOrderService.OdsProcureOutOrderTSCK(order);
return success(result);
}
}

@ -153,4 +153,16 @@ public interface OdsProcureOutOrderMapper {
void updateWMSOdsProcureOutOrdersapById(OdsProcureOutOrder order1);
List<OdsProcureOutOrder> listckTS(OdsProcureOutOrder odsProcureOutOrder);
void addOdsProcureOutOrderTS(OdsProcureOutOrder order);
List<OdsProcureOutOrder> listOdsProcureOutOrderTS(OdsProcureOutOrder order);
String selectOdsProcureOutOrderTS(String formattedDate);
List<OdsProcureOutOrder> selectWmsOdsProcureOutOrderSpecial(OdsProcureOutOrder odsProcureOutOrder1);
void updateWmsOdsProcureOutOrderSpecial(OdsProcureOutOrder order1);
List<OdsProcureOutOrder> selectWmsOdsProcureOutOrderByOrderStatusSpecial(OdsProcureOutOrder order);
}

@ -74,4 +74,6 @@ public interface WmsOdsMateStorageNewsMapper {
WmsOdsMateStorageNews selectWmsOdsMateStorageNewsLSByStorageId(String storageId);
public List<WmsOdsMateStorageNews> selectWmsOdsMateStorageNewsNEWSList(WmsOdsMateStorageNews wmsOdsMateStorageNews);
List<WmsOdsMateStorageNews> listWmsOdsMateStorageNews(WmsOdsMateStorageNews wmsOdsMateStorageNews);
}

@ -78,4 +78,10 @@ public interface IOdsProcureOutOrderService {
List<OdsProcureOutOrder> listReturnDY(OdsProcureOutOrder odsProcureOutOrder);
List<OdsProcureOutOrder> listckTS(OdsProcureOutOrder odsProcureOutOrder);
String addOdsProcureOutOrderTS(List<OdsProcureOutOrder> orderList);
List<OdsProcureOutOrder> listOdsProcureOutOrderTS(OdsProcureOutOrder order);
String OdsProcureOutOrderTSCK(OdsProcureOutOrder order);
}

@ -2,6 +2,7 @@ package com.op.wms.service;
import java.util.List;
import com.op.wms.domain.OdsProcureOutOrder;
import com.op.wms.domain.WmsSellOutEmbryo;
/**
@ -82,4 +83,6 @@ public interface IWmsSellOutEmbryoService {
List<WmsSellOutEmbryo> selectWmsSellOutEmbryoREList(WmsSellOutEmbryo wmsSellOutEmbryo);
String addRE(List<WmsSellOutEmbryo> wmsSellOutEmbryoList);
}

@ -25,12 +25,12 @@ import javax.servlet.http.HttpServletRequest;
/**
* Service
*
*
* @author ruoyi
* @date 2024-10-29
*/
@Service
public class BpRawMaterialInDetailServiceImpl implements IBpRawMaterialInDetailService
public class BpRawMaterialInDetailServiceImpl implements IBpRawMaterialInDetailService
{
@Autowired
private BpRawMaterialInDetailMapper bpRawMaterialInDetailMapper;
@ -43,7 +43,7 @@ public class BpRawMaterialInDetailServiceImpl implements IBpRawMaterialInDetailS
/**
*
*
*
* @param id
* @return
*/
@ -56,7 +56,7 @@ public class BpRawMaterialInDetailServiceImpl implements IBpRawMaterialInDetailS
/**
*
*
*
* @param bpRawMaterialInDetail
* @return
*/
@ -137,7 +137,7 @@ public class BpRawMaterialInDetailServiceImpl implements IBpRawMaterialInDetailS
/**
*
*
*
* @param bpRawMaterialInDetail
* @return
*/
@ -150,7 +150,7 @@ public class BpRawMaterialInDetailServiceImpl implements IBpRawMaterialInDetailS
/**
*
*
*
* @param ids
* @return
*/
@ -178,7 +178,7 @@ public class BpRawMaterialInDetailServiceImpl implements IBpRawMaterialInDetailS
/**
*
*
*
* @param id
* @return
*/

@ -2,14 +2,19 @@ package com.op.wms.service.impl;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.*;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
import com.op.common.core.domain.R;
import com.op.common.core.utils.uuid.IdUtils;
import com.op.common.security.utils.SecurityUtils;
import com.op.system.api.domain.sap.SapBackflushMPQuery;
import com.op.system.api.domain.sap.SapMaterialPosting;
import com.op.wms.domain.WmsOdsEmStorageNews;
import com.op.wms.domain.WmsOdsMateStorageNews;
import com.op.wms.domain.WmsOdsMateStorageNewsSn;
import com.op.wms.mapper.WmsOdsMateStorageNewsSnMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.op.wms.mapper.OdsProcureOutOrderMapper;
@ -30,6 +35,8 @@ import javax.servlet.http.HttpServletRequest;
public class OdsProcureOutOrderServiceImpl implements IOdsProcureOutOrderService {
@Autowired
private OdsProcureOutOrderMapper odsProcureOutOrderMapper;
@Autowired
private WmsOdsMateStorageNewsSnMapper wmsOdsMateStorageNewsSnMapper;
/**
*
@ -248,4 +255,145 @@ public class OdsProcureOutOrderServiceImpl implements IOdsProcureOutOrderService
List<OdsProcureOutOrder> orderList = odsProcureOutOrderMapper.listckTS(odsProcureOutOrder);
return orderList;
}
@Override
@DS("#header.poolName")
public String addOdsProcureOutOrderTS(List<OdsProcureOutOrder> orderList) {
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String key = "#header.poolName";
String factoryCode = request.getHeader(key.substring(8)).replace("ds_", "");
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
//TH ods_procure_order_card
Date date = new Date();
String formattedDate = dateFormat.format(date);
String result= odsProcureOutOrderMapper.selectOdsProcureOutOrderTS(formattedDate);
for (OdsProcureOutOrder order:
orderList) {
order.setID(IdUtils.fastSimpleUUID());
order.setFactoryCode(factoryCode);
order.setActive("1");
order.setProduceCode("TS"+result);
order.setCreateDate(new Date());
order.setUserDefined1(result);//批次
order.setOutNumber(new BigDecimal("0"));
order.setCreateBy(order.getCreateBy());
order.setOrderStatus("0");//0,未出库。1部分出库2全部出库
odsProcureOutOrderMapper.addOdsProcureOutOrderTS(order);
}
return null;
}
@Override
public List<OdsProcureOutOrder> listOdsProcureOutOrderTS(OdsProcureOutOrder procureOutOrder) {
String factoryCode = procureOutOrder.getFactoryCode();
DynamicDataSourceContextHolder.push("ds_" + factoryCode);
List<OdsProcureOutOrder> odsProcureOutOrders= odsProcureOutOrderMapper.listOdsProcureOutOrderTS(procureOutOrder);
return odsProcureOutOrders;
}
@Override
public String OdsProcureOutOrderTSCK(OdsProcureOutOrder procureOutOrder) {
String result="操作成功";
List<OdsProcureOutOrder> orderList= procureOutOrder.getOrderList();//标识卡
List<OdsProcureOutOrder> gzList= procureOutOrder.getGzList();//订单
// "mateOrderInSnId": "03b46cff74a444c4a065f8d2beb1e883",
// "materialCode": "000000040000018252",标识卡上的物料编号
// "materialDesc": "纸筒蚊香塑料盖2302",标识卡上的物料描述
// "sn": "4500360810-00020-0-20241010-1823-1",标识卡号
// "amount": 操作数量,
// factoryCode工厂号
// createBy操作人
// "produceCode":
if(orderList.size()>0){
String factoryCode = orderList.get(0).getFactoryCode();
DynamicDataSourceContextHolder.push("ds_" + factoryCode);
for (OdsProcureOutOrder odsProcureOutOrder :
orderList) {
String produceCode= odsProcureOutOrder.getProduceCode();//生产领料单号"订单编号"
String createBy= odsProcureOutOrder.getCreateBy();//操作人
String mateOrderInSnId= odsProcureOutOrder.getMateOrderInSnId();//标识卡对应id
String sn= odsProcureOutOrder.getSn();
String materialCode= odsProcureOutOrder.getMaterialCode();
String materialDesc= odsProcureOutOrder.getMaterialDesc();
BigDecimal amount= odsProcureOutOrder.getAmount();//数量
WmsOdsMateStorageNewsSn wmsOdsMateStorageNewsSn = wmsOdsMateStorageNewsSnMapper.selectWmsOdsMateStorageNewsSnByMateOrderInSnIdk(mateOrderInSnId);
//包材明细表
OdsProcureOutOrder order = new OdsProcureOutOrder();
order.setProduceCode(produceCode);//领料单
order.setMaterialCode(materialCode);//
order.setMaterialDesc(materialDesc);
order.setUserDefined1(wmsOdsMateStorageNewsSn.getUserDefined2());//批次
order.setUserDefined2(wmsOdsMateStorageNewsSn.getWhCode());
order.setUserDefined3(wmsOdsMateStorageNewsSn.getWlCode());
order.setSn(sn);
order.setPlanNumber(amount);
order.setLocCode(wmsOdsMateStorageNewsSn.getWaCode());//库区
order.setID(IdUtils.fastSimpleUUID());
order.setUnit(wmsOdsMateStorageNewsSn.getUserDefined1());
order.setFactoryCode(factoryCode);
order.setActive("1");
order.setCreateBy(createBy);
order.setCreateDate(new Date());
OdsProcureOutOrder odsProcureOutOrder1=new OdsProcureOutOrder();
odsProcureOutOrder1.setProduceCode(produceCode);
odsProcureOutOrder1.setMaterialCode(materialCode);
List<OdsProcureOutOrder> odsProcureOutOrders = odsProcureOutOrderMapper.selectWmsOdsProcureOutOrderSpecial(odsProcureOutOrder1);
//包材出库单----会有特殊的那种二次过账的单子--就看前端会不会传对应的标识卡了
OdsProcureOutOrder order1= odsProcureOutOrders.get(0);
order.setUserDefined4(order1.getUserDefined4());
//出库明细
odsProcureOutOrderMapper.insertWmsRawMissionOut(order);
//BigDecimal sapNumber =order1.getSapNumber();
BigDecimal realityNumber1 = order1.getOutNumber();//累出库数
BigDecimal realityNumber = order1.getPlanNumber();//计划
BigDecimal planNumber = amount;//本次实际数量
BigDecimal tem = realityNumber1.add(planNumber);
if (tem.compareTo(realityNumber)>= 0) {
order1.setOrderStatus("3");//3是满足出库数量
} else {
order1.setOrderStatus("2");
}
order1.setOutNumber(tem);//这样的话就可以用已经过账的数量来计算要过账的数量用出库数量减去已经过账的数量就是要过账的数量只要不为0就可以进行
// order1.setSapNumber(sapNumber.add(planNumber));//原本的过账数量
odsProcureOutOrderMapper.updateWmsOdsProcureOutOrderSpecial(order1);//订单修改--会超
wmsOdsMateStorageNewsSn.setOutNumber(amount);
wmsOdsMateStorageNewsSn.setLastModifiedBy(createBy);
//库存明细--包材库存
wmsOdsMateStorageNewsSnMapper.updateWmsOdsMateStorageNewsSnAddoutNumber(wmsOdsMateStorageNewsSn);
WmsOdsEmStorageNews wmsOdsEmStorageNews = new WmsOdsEmStorageNews();
wmsOdsEmStorageNews.setWhCode(wmsOdsMateStorageNewsSn.getWhCode());//仓库编码
wmsOdsEmStorageNews.setWlCode(wmsOdsMateStorageNewsSn.getWlCode());//库位编码
wmsOdsEmStorageNews.setWaCode(wmsOdsMateStorageNewsSn.getWaCode());
wmsOdsEmStorageNews.setProductBatch(wmsOdsMateStorageNewsSn.getUserDefined2());
wmsOdsEmStorageNews.setMaterialCode(wmsOdsMateStorageNewsSn.getMaterialCode());
wmsOdsEmStorageNews.setAmount(odsProcureOutOrder.getPlanNumber());//库存
wmsOdsEmStorageNews.setLastModifiedBy(createBy);
wmsOdsMateStorageNewsSnMapper.updatekdd(wmsOdsEmStorageNews);//库存调整
}
}
OdsProcureOutOrder order=new OdsProcureOutOrder();
List<OdsProcureOutOrder> orderList1 = odsProcureOutOrderMapper.selectWmsOdsProcureOutOrderByOrderStatusSpecial(order);
if (orderList1.size()>0){
OutboundPostingzcSAPGYTS(orderList1);
}
if (gzList.size()>0) {
for (OdsProcureOutOrder order1:
gzList) {
System.out.print("---------"+order1.getID());
}
OutboundPostingzcSAPGYTS(gzList);
}
return result;
}
public void OutboundPostingzcSAPGYTS(List<OdsProcureOutOrder> orderList) {
//过账时要对其进行判断判断其内部订单,和成本中心
}
}

@ -213,8 +213,9 @@ public class WmsOdsMateStorageNewsServiceImpl implements IWmsOdsMateStorageNewsS
}
@Override
@DS("#header.poolName")
public List<WmsOdsMateStorageNews> listWmsOdsMateStorageNews(WmsOdsMateStorageNews wmsOdsMateStorageNews) {
return null;
return wmsOdsMateStorageNewsMapper.listWmsOdsMateStorageNews(wmsOdsMateStorageNews);
}
public String dayin( List<OdsProcureOrder> orderList) {

@ -13,9 +13,7 @@ import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
import com.op.common.core.utils.DateUtils;
import com.op.common.core.utils.uuid.IdUtils;
import com.op.wms.domain.OdsProcureOrder;
import com.op.wms.domain.ShipmentTDO;
import com.op.wms.domain.WmsFpStorageNewsSn;
import com.op.wms.domain.*;
import com.op.wms.mapper.WmsFpStorageNewsSnMapper;
import okhttp3.*;
import org.springframework.beans.factory.annotation.Autowired;
@ -24,7 +22,6 @@ import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.core.ValueOperations;
import org.springframework.stereotype.Service;
import com.op.wms.mapper.WmsSellOutEmbryoMapper;
import com.op.wms.domain.WmsSellOutEmbryo;
import com.op.wms.service.IWmsSellOutEmbryoService;
/**
@ -197,6 +194,8 @@ public class WmsSellOutEmbryoServiceImpl implements IWmsSellOutEmbryoService {
}
public List<WmsSellOutEmbryo> dayin( ) {
// 定义请求的URL地址
String url = dayinUrl2;

@ -1596,4 +1596,281 @@
</where>
</select>
<insert id="addOdsProcureOutOrderTS" parameterType="OdsProcureOutOrder">
insert into wms_ods_procure_out_order_special
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="siteCode != null">Site_code,</if>
<if test="ID != null">ID,</if>
<if test="produceCode != null">Produce_Code,</if>
<if test="materialCode != null">Material_Code,</if>
<if test="materialDesc != null">Material_Desc,</if>
<if test="planDate != null">Plan_Date,</if>
<if test="planNumber != null">Plan_Number,</if>
<if test="Unit != null">Unit,</if>
<if test="outNumber != null">Out_Number,</if>
<if test="locCode != null">Loc_Code,</if>
<if test="locDesc != null">Loc_Desc,</if>
<if test="productionLineDesc != null">Production_Line_Desc,</if>
<if test="productionLineCode != null">Production_Line_Code,</if>
<if test="orderStatus != null">Order_Status,</if>
<if test="userDefined1 != null">User_Defined1,</if>
<if test="userDefined2 != null">User_Defined2,</if>
<if test="userDefined3 != null">User_Defined3,</if>
<if test="userDefined4 != null">User_Defined4,</if>
<if test="userDefined5 != null">User_Defined5,</if>
<if test="userDefined6 != null">User_Defined6,</if>
<if test="userDefined7 != null">User_Defined7,</if>
<if test="userDefined8 != null">User_Defined8,</if>
<if test="userDefined9 != null">User_Defined9,</if>
<if test="userDefined10 != null">User_Defined10,</if>
<if test="userDefined11 != null">User_Defined11,</if>
<if test="supplierCode != null">Supplier_Code,</if>
<if test="supplierName != null">Supplier_Name,</if>
<if test="createBy != null">Create_By,</if>
<if test="createDate != null">Create_Date,</if>
<if test="lastUpdateBy != null">Last_Update_By,</if>
<if test="lastUpdateDate != null">Last_Update_Date,</if>
<if test="Active != null">Active,</if>
<if test="enterpriseId != null">Enterprise_Id,</if>
<if test="enterpriseCode != null">Enterprise_Code,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="siteCode != null">#{siteCode},</if>
<if test="ID != null">#{ID},</if>
<if test="produceCode != null">#{produceCode},</if>
<if test="materialCode != null">#{materialCode},</if>
<if test="materialDesc != null">#{materialDesc},</if>
<if test="planDate != null">#{planDate},</if>
<if test="planNumber != null">#{planNumber},</if>
<if test="Unit != null">#{Unit},</if>
<if test="outNumber != null">#{outNumber},</if>
<if test="locCode != null">#{locCode},</if>
<if test="locDesc != null">#{locDesc},</if>
<if test="productionLineDesc != null">#{productionLineDesc},</if>
<if test="productionLineCode != null">#{productionLineCode},</if>
<if test="orderStatus != null">#{orderStatus},</if>
<if test="userDefined1 != null">#{userDefined1},</if>
<if test="userDefined2 != null">#{userDefined2},</if>
<if test="userDefined3 != null">#{userDefined3},</if>
<if test="userDefined4 != null">#{userDefined4},</if>
<if test="userDefined5 != null">#{userDefined5},</if>
<if test="userDefined6 != null">#{userDefined6},</if>
<if test="userDefined7 != null">#{userDefined7},</if>
<if test="userDefined8 != null">#{userDefined8},</if>
<if test="userDefined9 != null">#{userDefined9},</if>
<if test="userDefined10 != null">#{userDefined10},</if>
<if test="userDefined11 != null">#{userDefined11},</if>
<if test="supplierCode != null">#{supplierCode},</if>
<if test="supplierName != null">#{supplierName},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createDate != null">#{createDate},</if>
<if test="lastUpdateBy != null">#{lastUpdateBy},</if>
<if test="lastUpdateDate != null">#{lastUpdateDate},</if>
<if test="Active != null">#{Active},</if>
<if test="enterpriseId != null">#{enterpriseId},</if>
<if test="enterpriseCode != null">#{enterpriseCode},</if>
</trim>
</insert>
<select id="listOdsProcureOutOrderTS" parameterType="OdsProcureOutOrder" resultMap="OdsProcureOutOrderResult">
SELECT
Site_code,
ID,
Produce_Code,
Material_Code,
Material_Desc,
Plan_Date,
Plan_Number,
Unit,
COALESCE ( Out_Number, 0 ) AS Out_Number,
Loc_Code,
Loc_Desc,
Production_Line_Desc,
Production_Line_Code,
Order_Status,
User_Defined1,
User_Defined2,
User_Defined3,
User_Defined4,
User_Defined5,
User_Defined6,
User_Defined7,
User_Defined8,
User_Defined9,
User_Defined10,
User_Defined11,
Supplier_Code,
Supplier_Name,
Create_By,
Create_Date,
Last_Update_By,
Last_Update_Date,
Active,
Enterprise_Id,
Enterprise_Code
FROM
wms_ods_procure_out_order_special
<where>
<if test="siteCode != null and siteCode != ''"> and Site_code = #{siteCode}</if>
<if test="produceCode != null and produceCode != ''"> and Produce_Code = #{produceCode}</if>
<if test="materialCode != null and materialCode != ''"> and Material_Code = #{materialCode}</if>
<if test="materialDesc != null and materialDesc != ''"> and Material_Desc = #{materialDesc}</if>
<if test="planDate != null "> and Plan_Date = #{planDate}</if>
<if test="planNumber != null "> and Plan_Number = #{planNumber}</if>
<if test="Unit != null and Unit != ''"> and Unit = #{Unit}</if>
<if test="outNumber != null "> and Out_Number = #{outNumber}</if>
<if test="locCode != null and locCode != ''"> and Loc_Code = #{locCode}</if>
<if test="locDesc != null and locDesc != ''"> and Loc_Desc = #{locDesc}</if>
<if test="productionLineDesc != null and productionLineDesc != ''"> and Production_Line_Desc = #{productionLineDesc}</if>
<if test="productionLineCode != null and productionLineCode != ''"> and Production_Line_Code = #{productionLineCode}</if>
<if test="orderStatus != null and orderStatus != ''"> and Order_Status = #{orderStatus}</if>
<if test="userDefined1 != null and userDefined1 != ''"> and User_Defined1 = #{userDefined1}</if>
<if test="userDefined2 != null and userDefined2 != ''"> and User_Defined2 = #{userDefined2}</if>
<if test="userDefined3 != null and userDefined3 != ''"> and User_Defined3 = #{userDefined3}</if>
<if test="userDefined4 != null and userDefined4 != ''"> and User_Defined4 = #{userDefined4}</if>
<if test="userDefined5 != null and userDefined5 != ''"> and User_Defined5 = #{userDefined5}</if>
<if test="userDefined6 != null and userDefined6 != ''"> and User_Defined6 = #{userDefined6}</if>
<if test="userDefined7 != null and userDefined7 != ''"> and User_Defined7 = #{userDefined7}</if>
<if test="userDefined8 != null and userDefined8 != ''"> and User_Defined8 = #{userDefined8}</if>
<if test="userDefined9 != null and userDefined9 != ''"> and User_Defined9 = #{userDefined9}</if>
<if test="userDefined10 != null and userDefined10 != ''"> and User_Defined10 = #{userDefined10}</if>
<if test="userDefined11 != null and userDefined11 != ''"> and User_Defined11 = #{userDefined11}</if>
<if test="supplierCode != null and supplierCode != ''"> and Supplier_Code = #{supplierCode}</if>
<if test="supplierName != null and supplierName != ''"> and Supplier_Name like concat('%', #{supplierName}, '%')</if>
<if test="createBy != null and createBy != ''"> and Create_By = #{createBy}</if>
<if test="createDate != null "> and Create_Date = #{createDate}</if>
<if test="lastUpdateBy != null and lastUpdateBy != ''"> and Last_Update_By = #{lastUpdateBy}</if>
<if test="lastUpdateDate != null "> and Last_Update_Date = #{lastUpdateDate}</if>
<if test="Active != null and Active != ''"> and Active = #{Active}</if>
<if test="enterpriseId != null and enterpriseId != ''"> and Enterprise_Id = #{enterpriseId}</if>
<if test="enterpriseCode != null and enterpriseCode != ''"> and Enterprise_Code = #{enterpriseCode}</if>
</where>
</select>
<select id="selectOdsProcureOutOrderTS" resultType="java.lang.String">
SELECT
COALESCE(
MAX(TRY_CAST(User_Defined1 AS BIGINT)) + 1, -- 使用 BIGINT 以避免溢出
CAST(CONCAT(#{formattedDate}, '0001') AS BIGINT) -- 同样使用 BIGINT
) AS Result_Value
FROM
wms_ods_procure_out_order_special
WHERE
User_Defined1 LIKE CONCAT('%', #{formattedDate}, '%');
</select>
<select id="selectWmsOdsProcureOutOrderSpecial" parameterType="OdsProcureOutOrder" resultMap="OdsProcureOutOrderResult">
SELECT
Site_code,
ID,
Produce_Code,
Material_Code,
Material_Desc,
Plan_Date,
Plan_Number,
Unit,
COALESCE ( Out_Number, 0 ) AS Out_Number,
Loc_Code,
Loc_Desc,
Production_Line_Desc,
Production_Line_Code,
Order_Status,
User_Defined1,
User_Defined2,
User_Defined3,
User_Defined4,
User_Defined5,
User_Defined6,
User_Defined7,
User_Defined8,
User_Defined9,
User_Defined10,
User_Defined11,
Supplier_Code,
Supplier_Name,
Create_By,
Create_Date,
Last_Update_By,
Last_Update_Date,
Active,
Enterprise_Id,
COALESCE ( Sap_Number, 0 ) AS Sap_Number,
Enterprise_Code
FROM
wms_ods_procure_out_order_special
<where>
<if test="siteCode != null and siteCode != ''"> and Site_code = #{siteCode}</if>
<if test="produceCode != null and produceCode != ''"> and Produce_Code = #{produceCode}</if>
<if test="materialCode != null and materialCode != ''"> and Material_Code = #{materialCode}</if>
<if test="materialDesc != null and materialDesc != ''"> and Material_Desc = #{materialDesc}</if>
<if test="planDate != null "> and Plan_Date = #{planDate}</if>
<if test="planNumber != null "> and Plan_Number = #{planNumber}</if>
<if test="Unit != null and Unit != ''"> and Unit = #{Unit}</if>
<if test="outNumber != null "> and Out_Number = #{outNumber}</if>
<if test="locCode != null and locCode != ''"> and Loc_Code = #{locCode}</if>
<if test="locDesc != null and locDesc != ''"> and Loc_Desc = #{locDesc}</if>
<if test="productionLineDesc != null and productionLineDesc != ''"> and Production_Line_Desc = #{productionLineDesc}</if>
<if test="productionLineCode != null and productionLineCode != ''"> and Production_Line_Code = #{productionLineCode}</if>
<if test="orderStatus != null and orderStatus != ''"> and Order_Status = #{orderStatus}</if>
<if test="userDefined1 != null and userDefined1 != ''"> and User_Defined1 = #{userDefined1}</if>
<if test="userDefined2 != null and userDefined2 != ''"> and User_Defined2 = #{userDefined2}</if>
<!-- <if test="userDefined3 != null and userDefined3 != ''"> and User_Defined3 = #{userDefined3}</if>-->
<if test="userDefined4 != null and userDefined4 != ''"> and User_Defined4 = #{userDefined4}</if>
<if test="userDefined5 != null and userDefined5 != ''"> and User_Defined5 = #{userDefined5}</if>
<if test="userDefined6 != null and userDefined6 != ''"> and User_Defined6 = #{userDefined6}</if>
<if test="userDefined7 != null and userDefined7 != ''"> and User_Defined7 = #{userDefined7}</if>
<if test="userDefined8 != null and userDefined8 != ''"> and User_Defined8 = #{userDefined8}</if>
<if test="userDefined9 != null and userDefined9 != ''"> and User_Defined9 = #{userDefined9}</if>
<if test="userDefined10 != null and userDefined10 != ''"> and User_Defined10 = #{userDefined10}</if>
<if test="userDefined11 != null and userDefined11 != ''"> and User_Defined11 = #{userDefined11}</if>
<if test="supplierCode != null and supplierCode != ''"> and Supplier_Code = #{supplierCode}</if>
<if test="supplierName != null and supplierName != ''"> and Supplier_Name like concat('%', #{supplierName}, '%')</if>
<if test="createBy != null and createBy != ''"> and Create_By = #{createBy}</if>
<if test="createDate != null "> and Create_Date = #{createDate}</if>
<if test="lastUpdateBy != null and lastUpdateBy != ''"> and Last_Update_By = #{lastUpdateBy}</if>
<if test="lastUpdateDate != null "> and Last_Update_Date = #{lastUpdateDate}</if>
<if test="Active != null and Active != ''"> and Active = #{Active}</if>
<if test="enterpriseId != null and enterpriseId != ''"> and Enterprise_Id = #{enterpriseId}</if>
<if test="enterpriseCode != null and enterpriseCode != ''"> and Enterprise_Code = #{enterpriseCode}</if>
</where>
</select>
<select id="selectWmsOdsProcureOutOrderByOrderStatusSpecial" parameterType="OdsProcureOutOrder" resultMap="OdsProcureOutOrderResult">
SELECT
Site_code,
ID,
Produce_Code,
Material_Code,
Material_Desc,
Plan_Date,
Plan_Number,
Unit,
COALESCE ( Out_Number, 0 ) AS Out_Number,
Loc_Code,
Loc_Desc,
Production_Line_Desc,
Production_Line_Code,
Order_Status,
User_Defined1,
User_Defined2,
User_Defined3,
User_Defined4,
User_Defined5,
User_Defined6,
User_Defined7,
User_Defined8,
User_Defined9,
User_Defined10,
User_Defined11,
Supplier_Code,
Supplier_Name,
Create_By,
Create_Date,
Last_Update_By,
Last_Update_Date,
Active,
Enterprise_Id,
Enterprise_Code
FROM
wms_ods_procure_out_order_special
where Order_Status='3' and Active='1'
and User_Defined10='1'
</select>
</mapper>

@ -404,4 +404,16 @@
gmt_modified=GETDATE()
where wh_code=#{whCode} and wl_code=#{wlCode} and wa_code=#{waCode} and material_code=#{materialCode}
</update>
<select id="listWmsOdsMateStorageNews" parameterType="WmsOdsMateStorageNews"
resultMap="WmsOdsMateStorageNewsResult">
SELECT DISTINCT
material_code,
material_desc,
user_defined1
FROM
wms_ods_mate_storage_news
<where>
<if test="materialCode != null">material_code = #{materialCode},</if>
</where>
</select>
</mapper>

Loading…
Cancel
Save